From: notaz Date: Mon, 6 Jun 2022 22:59:51 +0000 (+0300) Subject: cdriso: hack .chd track handling to match .cue X-Git-Tag: r24~369 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=817d98eeb920176f2a4bd090482a76b986b036d6;p=pcsx_rearmed.git cdriso: hack .chd track handling to match .cue libretro/pcsx_rearmed#648 --- diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 599e1401..9d74ef46 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -931,7 +931,7 @@ fail_io: #ifdef HAVE_CHD static int handlechd(const char *isofile) { - int frame_offset = 0; + int frame_offset = 150; int file_offset = 0; chd_img = calloc(1, sizeof(*chd_img)); @@ -983,25 +983,23 @@ static int handlechd(const char *isofile) { SysPrintf("chd: %s\n", meta); if (md.track == 1) { - md.pregap = 150; if (!strncmp(md.subtype, "RW", 2)) { subChanMixed = TRUE; if (!strcmp(md.subtype, "RW_RAW")) subChanRaw = TRUE; } } - else - sec2msf(msf2sec(ti[md.track-1].length) + md.pregap, ti[md.track-1].length); 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); - ti[md.track].start_offset = file_offset; + ti[md.track].start_offset = file_offset + md.pregap; - frame_offset += md.pregap + md.frames + md.postgap; - file_offset += md.frames + md.postgap; + // XXX: what about postgap? + frame_offset += md.frames; + file_offset += md.frames; numtracks++; }