X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=libpcsxcore%2Fcdriso.c;h=eeb2c351a28c47f70ca5400f549f36e6403414ac;hb=9165d434d935746da54484381ebbee754e899680;hp=3189579494b4c9edfaf3467bdceb6f1d97012489;hpb=9afc3b574dbe79c7a4c615986beb503cc5435864;p=pcsx_rearmed.git diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 31895794..eeb2c351 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -30,8 +30,7 @@ #include #include #define strcasecmp _stricmp -#define usleep(x) Sleep((x) / 1000) -#else +#elif P_HAVE_PTHREAD #include #include #include @@ -110,7 +109,7 @@ struct trackinfo { char start[3]; // MSF-format char length[3]; // MSF-format FILE *handle; // for multi-track images CDDA - unsigned int start_offset; // byte offset from start of above file + unsigned int start_offset; // byte offset from start of above file (chd: sector offset) }; #define MAXTRACKS 100 /* How many tracks can a CD hold? */ @@ -1229,7 +1228,7 @@ static int cdread_chd(FILE *f, unsigned int base, void *dest, int sector) { int hunk; - assert(base == 0); + sector += base; hunk = sector / chd_img->sectors_per_hunk; chd_img->sector_in_hunk = sector % chd_img->sectors_per_hunk;