From: Twinaphex <libretro@gmail.com>
Date: Wed, 15 May 2019 12:22:29 +0000 (+0200)
Subject: Merge pull request #283 from aliaspider/master
X-Git-Tag: r24l~730
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e0deb4b36b49a45061098fc531556bb6cea3e9e;hp=763dadc797087948c26770f50aab1397f2519dc9;p=pcsx_rearmed.git

Merge pull request #283 from aliaspider/master

fix track information when loading CHDs.
---

diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index fb074e5c..7007f551 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -1059,7 +1059,7 @@ static int handlechd(const char *isofile) {
    cddaBigEndian = TRUE;
 
 	numtracks = 0;
-	int frame_offset = 0;
+	int frame_offset = 150;
 	memset(ti, 0, sizeof(ti));
 
    while (1)
@@ -1087,14 +1087,14 @@ static int handlechd(const char *isofile) {
 		ti[md.track].type = !strncmp(md.type, "AUDIO", 5) ? CDDA : DATA;
 
       sec2msf(frame_offset + md.pregap, ti[md.track].start);
-      sec2msf(md.frames, ti[md.track].length);
+      sec2msf(md.frames - md.pregap, ti[md.track].length);
 
       if (!strcmp(md.type, md.pgtype))
          frame_offset += md.pregap;
 
       ti[md.track].start_offset = frame_offset * CD_FRAMESIZE_RAW;
 
-		frame_offset += (md.frames + 3) & ~3;
+		frame_offset += md.frames;
 		frame_offset += md.postgap;
 		numtracks++;
 	}