X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fcdriso.c;h=dca64fadfc7d8e70c1f4b0973a43f5f8595601c8;hp=9d74ef46ac37ebd948631940aea2ddad35737eb1;hb=HEAD;hpb=817d98eeb920176f2a4bd090482a76b986b036d6 diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 9d74ef46..cd2d2026 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -26,15 +26,15 @@ #include "ppf.h" #ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN -#include -#include #define strcasecmp _stricmp -#define usleep(x) Sleep((x) / 1000) #else +#include +#include +#include +#if P_HAVE_PTHREAD #include #include -#include +#endif #endif #include #include @@ -54,14 +54,12 @@ static FILE *subHandle = NULL; static boolean subChanMixed = FALSE; static boolean subChanRaw = FALSE; -static boolean subChanMissing = FALSE; static boolean multifile = FALSE; static unsigned char cdbuffer[CD_FRAMESIZE_RAW]; static unsigned char subbuffer[SUB_FRAMESIZE]; -static boolean playing = FALSE; static boolean cddaBigEndian = FALSE; /* Frame offset into CD image where pregap data would be found if it was there. * If a game seeks there we must *not* return subchannel data since it's @@ -69,8 +67,6 @@ static boolean cddaBigEndian = FALSE; * XXX: there could be multiple pregaps but PSX dumps only have one? */ static unsigned int pregapOffset; -static unsigned int cddaCurPos; - // compressed image stuff static struct { unsigned char buff_raw[16][CD_FRAMESIZE_RAW]; @@ -84,23 +80,27 @@ static struct { #ifdef HAVE_CHD static struct { - unsigned char (*buffer)[CD_FRAMESIZE_RAW + SUB_FRAMESIZE]; + unsigned char *buffer; chd_file* chd; const chd_header* header; unsigned int sectors_per_hunk; - unsigned int current_hunk; + unsigned int current_hunk[2]; + unsigned int current_buffer; unsigned int sector_in_hunk; } *chd_img; +#else +#define chd_img 0 #endif -int (*cdimg_read_func)(FILE *f, unsigned int base, void *dest, int sector); +static int (*cdimg_read_func)(FILE *f, unsigned int base, void *dest, int sector); +static int (*cdimg_read_sub_func)(FILE *f, int sector); char* CALLBACK CDR__getDriveLetter(void); long CALLBACK CDR__configure(void); long CALLBACK CDR__test(void); void CALLBACK CDR__about(void); long CALLBACK CDR__setfilename(char *filename); -long CALLBACK CDR__getStatus(struct CdrStat *stat); +long CALLBACK CDR__prefetch(u8 m, u8 s, u8 f); static void DecodeRawSubData(void); @@ -109,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? */ @@ -159,6 +159,21 @@ static void tok2msf(char *time, char *msf) { } } +static off_t get_size(FILE *f) +{ + off_t old, size; +#if !defined(USE_LIBRETRO_VFS) + struct stat st; + if (fstat(fileno(f), &st) == 0) + return st.st_size; +#endif + old = ftello(f); + fseeko(f, 0, SEEK_END); + size = ftello(f); + fseeko(f, old, SEEK_SET); + return size; +} + // this function tries to get the .toc file of the given .bin // the necessary data is put into the ti (trackinformation)-array static int parsetoc(const char *isofile) { @@ -202,7 +217,8 @@ static int parsetoc(const char *isofile) { // check if it's really a TOC named as a .cue if (fgets(linebuf, sizeof(linebuf), fi) != NULL) { token = strtok(linebuf, " "); - if (token && strncmp(token, "CD", 2) != 0 && strcmp(token, "CATALOG") != 0) { + if (token && strncmp(token, "CD", 2) != 0) { + // && strcmp(token, "CATALOG") != 0) - valid for a real .cue fclose(fi); return -1; } @@ -312,6 +328,7 @@ static int parsecue(const char *isofile) { char filepath[MAXPATHLEN]; char *incue_fname; FILE *fi; + FILE *ftmp = NULL; char *token; char time[20]; char *tmp; @@ -325,18 +342,21 @@ static int parsecue(const char *isofile) { // copy name of the iso and change extension from .bin to .cue strncpy(cuename, isofile, sizeof(cuename)); cuename[MAXPATHLEN - 1] = '\0'; - if (strlen(cuename) >= 4) { + if (strlen(cuename) < 4) + return -1; + if (strcasecmp(cuename + strlen(cuename) - 4, ".cue") == 0) { + // it's already open as cdHandle + fi = cdHandle; + } + else { // If 'isofile' is a '.cd' file, use it as a .cue file // and don't try to search the additional .cue file if (strncasecmp(cuename + strlen(cuename) - 4, ".cd", 3) != 0 ) - strcpy(cuename + strlen(cuename) - 4, ".cue"); - } - else { - return -1; - } + strcpy(cuename + strlen(cuename) - 4, ".cue"); - if ((fi = fopen(cuename, "r")) == NULL) { - return -1; + if ((ftmp = fopen(cuename, "r")) == NULL) + return -1; + fi = ftmp; } // Some stupid tutorials wrongly tell users to use cdrdao to rip a @@ -346,10 +366,11 @@ static int parsecue(const char *isofile) { if (!strncmp(linebuf, "CD_ROM_XA", 9)) { // Don't proceed further, as this is actually a .toc file rather // than a .cue file. - fclose(fi); + if (ftmp) + fclose(ftmp); return parsetoc(isofile); } - fseek(fi, 0, SEEK_SET); + rewind(fi); } // build a path for files referenced in .cue @@ -457,25 +478,23 @@ static int parsecue(const char *isofile) { SysPrintf(_("\ncould not open: %s\n"), filepath); continue; } - fseek(ti[numtracks + 1].handle, 0, SEEK_END); - file_len = ftell(ti[numtracks + 1].handle) / 2352; - - if (numtracks == 0 && strlen(isofile) >= 4 && - (strcmp(isofile + strlen(isofile) - 4, ".cue") == 0 || - strncasecmp(isofile + strlen(isofile) - 4, ".cd", 3) == 0)) { - // user selected .cue/.cdX as image file, use it's data track instead - fclose(cdHandle); - cdHandle = fopen(filepath, "rb"); - } + file_len = get_size(ti[numtracks + 1].handle) / 2352; } } - fclose(fi); + if (ftmp) + fclose(ftmp); // if there are no tracks detected, then it's not a cue file if (!numtracks) return -1; + // the data track handle is always in cdHandle + if (ti[1].handle) { + fclose(cdHandle); + cdHandle = ti[1].handle; + ti[1].handle = NULL; + } return 0; } @@ -530,8 +549,7 @@ static int parseccd(const char *isofile) { // Fill out the last track's end based on size if (numtracks >= 1) { - fseek(cdHandle, 0, SEEK_END); - t = ftell(cdHandle) / 2352 - msf2sec(ti[numtracks].start) + 2 * 75; + t = get_size(cdHandle) / 2352 - msf2sec(ti[numtracks].start) + 2 * 75; sec2msf(t, ti[numtracks].length); } @@ -680,16 +698,15 @@ static int handlepbp(const char *isofile) { off_t psisoimg_offs, cdimg_base; unsigned int t, cd_length; unsigned int offsettab[8]; + unsigned int psar_offs, index_entry_size, index_entry_offset; const char *ext = NULL; int i, ret; if (strlen(isofile) >= 4) ext = isofile + strlen(isofile) - 4; - if (ext == NULL || (strcmp(ext, ".pbp") != 0 && strcmp(ext, ".PBP") != 0)) + if (ext == NULL || strcasecmp(ext, ".pbp") != 0) return -1; - fseeko(cdHandle, 0, SEEK_SET); - numtracks = 0; ret = fread(&pbp_hdr, 1, sizeof(pbp_hdr), cdHandle); @@ -698,21 +715,23 @@ static int handlepbp(const char *isofile) { goto fail_io; } - ret = fseeko(cdHandle, pbp_hdr.psar_offs, SEEK_SET); + psar_offs = SWAP32(pbp_hdr.psar_offs); + + ret = fseeko(cdHandle, psar_offs, SEEK_SET); if (ret != 0) { - SysPrintf("failed to seek to %x\n", pbp_hdr.psar_offs); + SysPrintf("failed to seek to %x\n", psar_offs); goto fail_io; } - psisoimg_offs = pbp_hdr.psar_offs; + psisoimg_offs = psar_offs; if (fread(psar_sig, 1, sizeof(psar_sig), cdHandle) != sizeof(psar_sig)) goto fail_io; psar_sig[10] = 0; if (strcmp(psar_sig, "PSTITLEIMG") == 0) { // multidisk image? - ret = fseeko(cdHandle, pbp_hdr.psar_offs + 0x200, SEEK_SET); + ret = fseeko(cdHandle, psar_offs + 0x200, SEEK_SET); if (ret != 0) { - SysPrintf("failed to seek to %x\n", pbp_hdr.psar_offs + 0x200); + SysPrintf("failed to seek to %x\n", psar_offs + 0x200); goto fail_io; } @@ -734,7 +753,7 @@ static int handlepbp(const char *isofile) { if (cdrIsoMultidiskSelect >= cdrIsoMultidiskCount) cdrIsoMultidiskSelect = 0; - psisoimg_offs += offsettab[cdrIsoMultidiskSelect]; + psisoimg_offs += SWAP32(offsettab[cdrIsoMultidiskSelect]); ret = fseeko(cdHandle, psisoimg_offs, SEEK_SET); if (ret != 0) { @@ -818,12 +837,15 @@ static int handlepbp(const char *isofile) { goto fail_index; } - if (index_entry.size == 0) + index_entry_size = SWAP32(index_entry.size); + index_entry_offset = SWAP32(index_entry.offset); + + if (index_entry_size == 0) break; - compr_img->index_table[i] = cdimg_base + index_entry.offset; + compr_img->index_table[i] = cdimg_base + index_entry_offset; } - compr_img->index_table[i] = cdimg_base + index_entry.offset + index_entry.size; + compr_img->index_table[i] = cdimg_base + index_entry_offset + index_entry_size; return 0; @@ -833,9 +855,8 @@ fail_index: goto done; fail_io: -#ifndef NDEBUG SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__); -#endif + rewind(cdHandle); done: if (compr_img != NULL) { @@ -866,23 +887,21 @@ static int handlecbin(const char *isofile) { if (ext == NULL || (strcasecmp(ext + 1, ".cbn") != 0 && strcasecmp(ext, ".cbin") != 0)) return -1; - fseek(cdHandle, 0, SEEK_SET); - ret = fread(&ciso_hdr, 1, sizeof(ciso_hdr), cdHandle); if (ret != sizeof(ciso_hdr)) { SysPrintf("failed to read ciso header\n"); - return -1; + goto fail_io; } if (strncmp(ciso_hdr.magic, "CISO", 4) != 0 || ciso_hdr.total_bytes <= 0 || ciso_hdr.block_size <= 0) { SysPrintf("bad ciso header\n"); - return -1; + goto fail_io; } if (ciso_hdr.header_size != 0 && ciso_hdr.header_size != sizeof(ciso_hdr)) { ret = fseeko(cdHandle, ciso_hdr.header_size, SEEK_SET); if (ret != 0) { SysPrintf("failed to seek to %x\n", ciso_hdr.header_size); - return -1; + goto fail_io; } } @@ -926,6 +945,7 @@ fail_io: free(compr_img); compr_img = NULL; } + rewind(cdHandle); return -1; } @@ -946,12 +966,13 @@ static int handlechd(const char *isofile) { chd_img->header = chd_get_header(chd_img->chd); - chd_img->buffer = malloc(chd_img->header->hunkbytes); + chd_img->buffer = malloc(chd_img->header->hunkbytes * 2); if (chd_img->buffer == NULL) goto fail_io; chd_img->sectors_per_hunk = chd_img->header->hunkbytes / (CD_FRAMESIZE_RAW + SUB_FRAMESIZE); - chd_img->current_hunk = (unsigned int)-1; + chd_img->current_hunk[0] = (unsigned int)-1; + chd_img->current_hunk[1] = (unsigned int)-1; cddaBigEndian = TRUE; @@ -1056,37 +1077,61 @@ static int opensbifile(const char *isoname) { return -1; } - fseek(cdHandle, 0, SEEK_END); - s = ftell(cdHandle) / 2352; + s = msf2sec(ti[1].length); return LoadSBI(sbiname, s); } static int cdread_normal(FILE *f, unsigned int base, void *dest, int sector) { - fseek(f, base + sector * CD_FRAMESIZE_RAW, SEEK_SET); - return fread(dest, 1, CD_FRAMESIZE_RAW, f); + int ret; + if (!f) + return -1; + if (fseeko(f, base + sector * CD_FRAMESIZE_RAW, SEEK_SET)) + goto fail_io; + ret = fread(dest, 1, CD_FRAMESIZE_RAW, f); + if (ret <= 0) + goto fail_io; + return ret; + +fail_io: + // often happens in cdda gaps of a split cue/bin, so not logged + //SysPrintf("File IO error %d, base %u, sector %u\n", errno, base, sector); + return -1; } static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector) { int ret; - fseek(f, base + sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE), SEEK_SET); + if (!f) + return -1; + if (fseeko(f, base + sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE), SEEK_SET)) + goto fail_io; ret = fread(dest, 1, CD_FRAMESIZE_RAW, f); + if (ret <= 0) + goto fail_io; + return ret; + +fail_io: + //SysPrintf("File IO error %d, base %u, sector %u\n", errno, base, sector); + return -1; +} + +static int cdread_sub_sub_mixed(FILE *f, int sector) +{ + if (!f) + return -1; + if (fseeko(f, sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE) + CD_FRAMESIZE_RAW, SEEK_SET)) + goto fail_io; if (fread(subbuffer, 1, SUB_FRAMESIZE, f) != SUB_FRAMESIZE) goto fail_io; - if (subChanRaw) DecodeRawSubData(); - goto done; + return SUB_FRAMESIZE; fail_io: -#ifndef NDEBUG - SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__); -#endif - -done: - return ret; + SysPrintf("subchannel: file IO error %d, sector %u\n", errno, sector); + return -1; } static int uncompress2_pcsx(void *out, unsigned long *out_size, void *in, unsigned long in_size) @@ -1128,6 +1173,8 @@ static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector) off_t start_byte; int ret, block; + if (!cdHandle) + return -1; if (base) sector += base / 2352; @@ -1191,40 +1238,75 @@ finish: } #ifdef HAVE_CHD +static unsigned char *chd_get_sector(unsigned int current_buffer, unsigned int sector_in_hunk) +{ + return chd_img->buffer + + current_buffer * chd_img->header->hunkbytes + + sector_in_hunk * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE); +} + static int cdread_chd(FILE *f, unsigned int base, void *dest, int sector) { int hunk; - if (base) - sector += base; + sector += base; hunk = sector / chd_img->sectors_per_hunk; chd_img->sector_in_hunk = sector % chd_img->sectors_per_hunk; - if (hunk != chd_img->current_hunk) + if (hunk == chd_img->current_hunk[0]) + chd_img->current_buffer = 0; + else if (hunk == chd_img->current_hunk[1]) + chd_img->current_buffer = 1; + else { - chd_read(chd_img->chd, hunk, chd_img->buffer); - chd_img->current_hunk = hunk; + chd_read(chd_img->chd, hunk, chd_img->buffer + + chd_img->current_buffer * chd_img->header->hunkbytes); + chd_img->current_hunk[chd_img->current_buffer] = hunk; } if (dest != cdbuffer) // copy avoid HACK - memcpy(dest, chd_img->buffer[chd_img->sector_in_hunk], + memcpy(dest, chd_get_sector(chd_img->current_buffer, chd_img->sector_in_hunk), CD_FRAMESIZE_RAW); - if (subChanMixed) { - memcpy(subbuffer, chd_img->buffer[chd_img->sector_in_hunk] + CD_FRAMESIZE_RAW, - SUB_FRAMESIZE); - if (subChanRaw) - DecodeRawSubData(); - } return CD_FRAMESIZE_RAW; } + +static int cdread_sub_chd(FILE *f, int sector) +{ + unsigned int sector_in_hunk; + unsigned int buffer; + int hunk; + + if (!subChanMixed) + return -1; + + hunk = sector / chd_img->sectors_per_hunk; + sector_in_hunk = sector % chd_img->sectors_per_hunk; + + if (hunk == chd_img->current_hunk[0]) + buffer = 0; + else if (hunk == chd_img->current_hunk[1]) + buffer = 1; + else + { + buffer = chd_img->current_buffer ^ 1; + chd_read(chd_img->chd, hunk, chd_img->buffer + + buffer * chd_img->header->hunkbytes); + chd_img->current_hunk[buffer] = hunk; + } + + memcpy(subbuffer, chd_get_sector(buffer, sector_in_hunk) + CD_FRAMESIZE_RAW, SUB_FRAMESIZE); + return SUB_FRAMESIZE; +} #endif static int cdread_2048(FILE *f, unsigned int base, void *dest, int sector) { int ret; - fseek(f, base + sector * 2048, SEEK_SET); + if (!f) + return -1; + fseeko(f, base + sector * 2048, SEEK_SET); ret = fread((char *)dest + 12 * 2, 1, 2048, f); // not really necessary, fake mode 2 header @@ -1232,7 +1314,7 @@ static int cdread_2048(FILE *f, unsigned int base, void *dest, int sector) sec2msf(sector + 2 * 75, (char *)&cdbuffer[12]); cdbuffer[12 + 3] = 1; - return ret; + return 12*2 + ret; } static unsigned char * CALLBACK ISOgetBuffer_compr(void) { @@ -1241,11 +1323,11 @@ static unsigned char * CALLBACK ISOgetBuffer_compr(void) { #ifdef HAVE_CHD static unsigned char * CALLBACK ISOgetBuffer_chd(void) { - return chd_img->buffer[chd_img->sector_in_hunk] + 12; + return chd_get_sector(chd_img->current_buffer, chd_img->sector_in_hunk) + 12; } #endif -static unsigned char * CALLBACK ISOgetBuffer(void) { +unsigned char * CALLBACK ISOgetBuffer(void) { return cdbuffer + 12; } @@ -1254,7 +1336,8 @@ static void PrintTracks(void) { for (i = 1; i <= numtracks; i++) { SysPrintf(_("Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"), - i, (ti[i].type == DATA ? "DATA" : "AUDIO"), + i, (ti[i].type == DATA ? "DATA" : + (ti[i].type == CDDA ? "AUDIO" : "UNKNOWN")), ti[i].start[0], ti[i].start[1], ti[i].start[2], ti[i].length[0], ti[i].length[1], ti[i].length[2]); } @@ -1267,9 +1350,9 @@ static long CALLBACK ISOopen(void) { char alt_bin_filename[MAXPATHLEN]; const char *bin_filename; char image_str[1024]; - int is_chd = 0; + off_t size_main; - if (cdHandle != NULL) { + if (cdHandle || chd_img) { return 0; // it's already open } @@ -1279,6 +1362,7 @@ static long CALLBACK ISOopen(void) { GetIsoFile(), strerror(errno)); return -1; } + size_main = get_size(cdHandle); snprintf(image_str, sizeof(image_str) - 6*4 - 1, "Loaded CD Image: %s", GetIsoFile()); @@ -1292,6 +1376,7 @@ static long CALLBACK ISOopen(void) { CDR_getBuffer = ISOgetBuffer; cdimg_read_func = cdread_normal; + cdimg_read_sub_func = NULL; if (parsetoc(GetIsoFile()) == 0) { strcat(image_str, "[+toc]"); @@ -1320,7 +1405,9 @@ static long CALLBACK ISOopen(void) { strcat(image_str, "[+chd]"); CDR_getBuffer = ISOgetBuffer_chd; cdimg_read_func = cdread_chd; - is_chd = 1; + cdimg_read_sub_func = cdread_sub_chd; + fclose(cdHandle); + cdHandle = NULL; } #endif @@ -1331,11 +1418,9 @@ static long CALLBACK ISOopen(void) { strcat(image_str, "[+sbi]"); } - fseeko(cdHandle, 0, SEEK_END); - // maybe user selected metadata file instead of main .bin .. bin_filename = GetIsoFile(); - if (ftello(cdHandle) < 2352 * 0x10) { + if (cdHandle && size_main < 2352 * 0x10) { static const char *exts[] = { ".bin", ".BIN", ".img", ".IMG" }; FILE *tmpf = NULL; size_t i; @@ -1356,39 +1441,33 @@ static long CALLBACK ISOopen(void) { bin_filename = alt_bin_filename; fclose(cdHandle); cdHandle = tmpf; - fseeko(cdHandle, 0, SEEK_END); + size_main = get_size(cdHandle); } } // guess whether it is mode1/2048 - if (ftello(cdHandle) % 2048 == 0) { + if (cdHandle && cdimg_read_func == cdread_normal && size_main % 2048 == 0) { unsigned int modeTest = 0; - fseek(cdHandle, 0, SEEK_SET); if (!fread(&modeTest, sizeof(modeTest), 1, cdHandle)) { -#ifndef NDEBUG SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__); -#endif - return -1; } if (SWAP32(modeTest) != 0xffffff00) { strcat(image_str, "[2048]"); isMode1ISO = TRUE; } } - fseek(cdHandle, 0, SEEK_SET); SysPrintf("%s.\n", image_str); PrintTracks(); - if (subChanMixed && !is_chd) + if (subChanMixed && cdimg_read_func == cdread_normal) { cdimg_read_func = cdread_sub_mixed; - else if (isMode1ISO) + cdimg_read_sub_func = cdread_sub_sub_mixed; + } + else if (isMode1ISO) { cdimg_read_func = cdread_2048; - - // make sure we have another handle open for cdda - if (numtracks > 1 && ti[1].handle == NULL) { - ti[1].handle = fopen(bin_filename, "rb"); + cdimg_read_sub_func = NULL; } return 0; @@ -1405,7 +1484,6 @@ static long CALLBACK ISOclose(void) { fclose(subHandle); subHandle = NULL; } - playing = FALSE; cddaHandle = NULL; if (compr_img != NULL) { @@ -1520,32 +1598,16 @@ static boolean CALLBACK ISOreadTrack(unsigned char *time) { int sector = MSF2SECT(btoi(time[0]), btoi(time[1]), btoi(time[2])); long ret; - if (cdHandle == NULL) { + if (!cdHandle && !chd_img) return 0; - } - if (pregapOffset) { - subChanMissing = FALSE; - if (sector >= pregapOffset) { - sector -= 2 * 75; - if (sector < pregapOffset) - subChanMissing = TRUE; - } - } + if (pregapOffset && sector >= pregapOffset) + sector -= 2 * 75; ret = cdimg_read_func(cdHandle, 0, cdbuffer, sector); - if (ret < 0) + if (ret < 12*2 + 2048) return 0; - if (subHandle != NULL) { - fseek(subHandle, sector * SUB_FRAMESIZE, SEEK_SET); - if (fread(subbuffer, 1, SUB_FRAMESIZE, subHandle) != SUB_FRAMESIZE) - /* Faulty subchannel data shouldn't cause a read failure */ - return 0; - - if (subChanRaw) DecodeRawSubData(); - } - return 1; } @@ -1553,42 +1615,45 @@ static boolean CALLBACK ISOreadTrack(unsigned char *time) { // sector: byte 0 - minute; byte 1 - second; byte 2 - frame // does NOT uses bcd format static long CALLBACK ISOplay(unsigned char *time) { - playing = TRUE; return 0; } // stops cdda audio static long CALLBACK ISOstop(void) { - playing = FALSE; return 0; } // gets subchannel data -static unsigned char* CALLBACK ISOgetBufferSub(void) { - if ((subHandle != NULL || subChanMixed) && !subChanMissing) { - return subbuffer; +static unsigned char* CALLBACK ISOgetBufferSub(int sector) { + if (pregapOffset && sector >= pregapOffset) { + sector -= 2 * 75; + if (sector < pregapOffset) // ? + return NULL; } - return NULL; + if (cdimg_read_sub_func != NULL) { + if (cdimg_read_sub_func(cdHandle, sector) != SUB_FRAMESIZE) + return NULL; + } + else if (subHandle != NULL) { + if (fseeko(subHandle, sector * SUB_FRAMESIZE, SEEK_SET)) + return NULL; + if (fread(subbuffer, 1, SUB_FRAMESIZE, subHandle) != SUB_FRAMESIZE) + return NULL; + } + else { + return NULL; + } + + if (subChanRaw) DecodeRawSubData(); + return subbuffer; } static long CALLBACK ISOgetStatus(struct CdrStat *stat) { - u32 sect; - CDR__getStatus(stat); - if (playing) { - stat->Type = 0x02; - stat->Status |= 0x80; - } - else { - // BIOS - boot ID (CD type) - stat->Type = ti[1].type; - } - - // relative -> absolute time - sect = cddaCurPos; - sec2msf(sect, (char *)stat->Time); + // BIOS - boot ID (CD type) + stat->Type = ti[1].type; return 0; } @@ -1596,7 +1661,9 @@ static long CALLBACK ISOgetStatus(struct CdrStat *stat) { // read CDDA sector into buffer long CALLBACK ISOreadCDDA(unsigned char m, unsigned char s, unsigned char f, unsigned char *buffer) { unsigned char msf[3] = {m, s, f}; - unsigned int file, track, track_start = 0; + unsigned int track, track_start = 0; + FILE *handle = cdHandle; + unsigned int cddaCurPos; int ret; cddaCurPos = msf2sec((char *)msf); @@ -1616,15 +1683,22 @@ long CALLBACK ISOreadCDDA(unsigned char m, unsigned char s, unsigned char f, uns return 0; } - file = 1; if (multifile) { // find the file that contains this track - for (file = track; file > 1; file--) - if (ti[file].handle != NULL) + unsigned int file; + for (file = track; file > 1; file--) { + if (ti[file].handle != NULL) { + handle = ti[file].handle; break; + } + } + } + if (!handle && !chd_img) { + memset(buffer, 0, CD_FRAMESIZE_RAW); + return -1; } - ret = cdimg_read_func(ti[file].handle, ti[track].start_offset, + ret = cdimg_read_func(handle, ti[track].start_offset, buffer, cddaCurPos - track_start); if (ret != CD_FRAMESIZE_RAW) { memset(buffer, 0, CD_FRAMESIZE_RAW); @@ -1665,10 +1739,11 @@ void cdrIsoInit(void) { CDR_test = CDR__test; CDR_about = CDR__about; CDR_setfilename = CDR__setfilename; + CDR_prefetch = CDR__prefetch; numtracks = 0; } int cdrIsoActive(void) { - return (cdHandle != NULL); + return (cdHandle || chd_img); }