cdrom: change pause timing again
[pcsx_rearmed.git] / libpcsxcore / cdriso.c
index dde21bc..cd2d202 100644 (file)
 #include "ppf.h"
 
 #ifdef _WIN32
-#include <process.h>
-#include <windows.h>
 #define strcasecmp _stricmp
 #else
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#if P_HAVE_PTHREAD
 #include <pthread.h>
 #include <sys/time.h>
-#include <unistd.h>
 #endif
+#endif
+#include <errno.h>
 #include <zlib.h>
 
+#ifdef HAVE_CHD
+#include "libchdr/chd.h"
+#endif
+
+#define OFF_T_MSB ((off_t)1 << (sizeof(off_t) * 8 - 1))
+
 unsigned int cdrIsoMultidiskCount;
 unsigned int cdrIsoMultidiskSelect;
 
@@ -45,56 +54,53 @@ 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 unsigned char sndbuffer[CD_FRAMESIZE_RAW * 10];
-
-#define CDDA_FRAMETIME                 (1000 * (sizeof(sndbuffer) / CD_FRAMESIZE_RAW) / 75)
-
-#ifdef _WIN32
-static HANDLE threadid;
-#else
-static pthread_t threadid;
-#endif
-static unsigned int initial_offset = 0;
-static boolean playing = FALSE;
 static boolean cddaBigEndian = FALSE;
-// cdda sectors in toc, byte offset in file
-static unsigned int cdda_cur_sector;
-static unsigned int cdda_first_sector;
-static unsigned int cdda_file_offset;
 /* 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
  * not in the CD image, so that cdrom code can fake subchannel data instead.
  * XXX: there could be multiple pregaps but PSX dumps only have one? */
 static unsigned int pregapOffset;
 
-#define cddaCurPos cdda_cur_sector
-
 // compressed image stuff
 static struct {
        unsigned char buff_raw[16][CD_FRAMESIZE_RAW];
        unsigned char buff_compressed[CD_FRAMESIZE_RAW * 16 + 100];
-       unsigned int *index_table;
+       off_t *index_table;
        unsigned int index_len;
        unsigned int block_shift;
        unsigned int current_block;
        unsigned int sector_in_blk;
 } *compr_img;
 
-int (*cdimg_read_func)(FILE *f, unsigned int base, void *dest, int sector);
+#ifdef HAVE_CHD
+static struct {
+       unsigned char *buffer;
+       chd_file* chd;
+       const chd_header* header;
+       unsigned int sectors_per_hunk;
+       unsigned int current_hunk[2];
+       unsigned int current_buffer;
+       unsigned int sector_in_hunk;
+} *chd_img;
+#else
+#define chd_img 0
+#endif
+
+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);
 
@@ -103,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? */
@@ -153,138 +159,19 @@ static void tok2msf(char *time, char *msf) {
        }
 }
 
-#ifndef _WIN32
-static long GetTickCount(void) {
-       static time_t           initial_time = 0;
-       struct timeval          now;
-
-       gettimeofday(&now, NULL);
-
-       if (initial_time == 0) {
-               initial_time = now.tv_sec;
-       }
-
-       return (now.tv_sec - initial_time) * 1000L + now.tv_usec / 1000L;
-}
-#endif
-
-// this thread plays audio data
-#ifdef _WIN32
-static void playthread(void *param)
-#else
-static void *playthread(void *param)
-#endif
+static off_t get_size(FILE *f)
 {
-       long osleep, d, t, i, s;
-       unsigned char   tmp;
-       int ret = 0, sector_offs;
-
-       t = GetTickCount();
-
-       while (playing) {
-               s = 0;
-               for (i = 0; i < sizeof(sndbuffer) / CD_FRAMESIZE_RAW; i++) {
-                       sector_offs = cdda_cur_sector - cdda_first_sector;
-                       if (sector_offs < 0) {
-                               d = CD_FRAMESIZE_RAW;
-                               memset(sndbuffer + s, 0, d);
-                       }
-                       else {
-                               d = cdimg_read_func(cddaHandle, cdda_file_offset,
-                                       sndbuffer + s, sector_offs);
-                               if (d < CD_FRAMESIZE_RAW)
-                                       break;
-                       }
-
-                       s += d;
-                       cdda_cur_sector++;
-               }
-
-               if (s == 0) {
-                       playing = FALSE;
-                       initial_offset = 0;
-                       break;
-               }
-
-               if (!cdr.Muted && playing) {
-                       if (cddaBigEndian) {
-                               for (i = 0; i < s / 2; i++) {
-                                       tmp = sndbuffer[i * 2];
-                                       sndbuffer[i * 2] = sndbuffer[i * 2 + 1];
-                                       sndbuffer[i * 2 + 1] = tmp;
-                               }
-                       }
-
-                       // can't do it yet due to readahead..
-                       //cdrAttenuate((short *)sndbuffer, s / 4, 1);
-                       do {
-                               ret = SPU_playCDDAchannel((short *)sndbuffer, s);
-                               if (ret == 0x7761)
-                                       usleep(6 * 1000);
-                       } while (ret == 0x7761 && playing); // rearmed_wait
-               }
-
-               if (ret != 0x676f) { // !rearmed_go
-                       // do approx sleep
-                       long now;
-
-                       // HACK: stop feeding data while emu is paused
-                       extern int stop;
-                       while (stop && playing)
-                               usleep(10000);
-
-                       now = GetTickCount();
-                       osleep = t - now;
-                       if (osleep <= 0) {
-                               osleep = 1;
-                               t = now;
-                       }
-                       else if (osleep > CDDA_FRAMETIME) {
-                               osleep = CDDA_FRAMETIME;
-                               t = now;
-                       }
-
-                       usleep(osleep * 1000);
-                       t += CDDA_FRAMETIME;
-               }
-
-       }
-
-#ifdef _WIN32
-       _endthread();
-#else
-       pthread_exit(0);
-       return NULL;
-#endif
-}
-
-// stop the CDDA playback
-static void stopCDDA() {
-       if (!playing) {
-               return;
-       }
-
-       playing = FALSE;
-#ifdef _WIN32
-       WaitForSingleObject(threadid, INFINITE);
-#else
-       pthread_join(threadid, NULL);
-#endif
-}
-
-// start the CDDA playback
-static void startCDDA(void) {
-       if (playing) {
-               stopCDDA();
-       }
-
-       playing = TRUE;
-
-#ifdef _WIN32
-       threadid = (HANDLE)_beginthread(playthread, 0, NULL);
-#else
-       pthread_create(&threadid, NULL, playthread, NULL);
+       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
@@ -327,6 +214,16 @@ static int parsetoc(const char *isofile) {
                                return -1;
                        }
                }
+               // 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) - valid for a real .cue
+                       fclose(fi);
+                       return -1;
+               }
+               }
+               fseek(fi, 0, SEEK_SET);
        }
 
        memset(&ti, 0, sizeof(ti));
@@ -431,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;
@@ -444,15 +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) {
-               strcpy(cuename + strlen(cuename) - 4, ".cue");
-       }
-       else {
+       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<X>' 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");
 
-       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
@@ -462,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
@@ -543,9 +448,9 @@ static int parsecue(const char *isofile) {
                        pregapOffset = -1; // mark to fill track start_offset
                }
                else if (!strcmp(token, "FILE")) {
-                       t = sscanf(linebuf, " FILE \"%256[^\"]\"", tmpb);
+                       t = sscanf(linebuf, " FILE \"%255[^\"]\"", tmpb);
                        if (t != 1)
-                               sscanf(linebuf, " FILE %256s", tmpb);
+                               sscanf(linebuf, " FILE %255s", tmpb);
 
                        // absolute path?
                        ti[numtracks + 1].handle = fopen(tmpb, "rb");
@@ -573,21 +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)
-                       {
-                               // user selected .cue 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;
 }
 
@@ -642,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);
        }
 
@@ -677,7 +583,8 @@ static int parsemds(const char *isofile) {
        memset(&ti, 0, sizeof(ti));
 
        // check if it's a valid mds file
-       fread(&i, 1, sizeof(unsigned int), fi);
+       if (fread(&i, 1, sizeof(i), fi) != sizeof(i))
+               goto fail_io;
        i = SWAP32(i);
        if (i != 0x4944454D) {
                // not an valid mds file
@@ -687,19 +594,22 @@ static int parsemds(const char *isofile) {
 
        // get offset to session block
        fseek(fi, 0x50, SEEK_SET);
-       fread(&offset, 1, sizeof(unsigned int), fi);
+       if (fread(&offset, 1, sizeof(offset), fi) != sizeof(offset))
+               goto fail_io;
        offset = SWAP32(offset);
 
        // get total number of tracks
        offset += 14;
        fseek(fi, offset, SEEK_SET);
-       fread(&s, 1, sizeof(unsigned short), fi);
+       if (fread(&s, 1, sizeof(s), fi) != sizeof(s))
+               goto fail_io;
        s = SWAP16(s);
        numtracks = s;
 
        // get offset to track blocks
        fseek(fi, 4, SEEK_CUR);
-       fread(&offset, 1, sizeof(unsigned int), fi);
+       if (fread(&offset, 1, sizeof(offset), fi) != sizeof(offset))
+               goto fail_io;
        offset = SWAP32(offset);
 
        // skip lead-in data
@@ -728,32 +638,41 @@ static int parsemds(const char *isofile) {
                ti[i].start[1] = fgetc(fi);
                ti[i].start[2] = fgetc(fi);
 
-               fread(&extra_offset, 1, sizeof(unsigned int), fi);
+               if (fread(&extra_offset, 1, sizeof(extra_offset), fi) != sizeof(extra_offset))
+                       goto fail_io;
                extra_offset = SWAP32(extra_offset);
 
                // get track start offset (in .mdf)
                fseek(fi, offset + 0x28, SEEK_SET);
-               fread(&l, 1, sizeof(unsigned int), fi);
+               if (fread(&l, 1, sizeof(l), fi) != sizeof(l))
+                       goto fail_io;
                l = SWAP32(l);
                ti[i].start_offset = l;
 
                // get pregap
                fseek(fi, extra_offset, SEEK_SET);
-               fread(&l, 1, sizeof(unsigned int), fi);
+               if (fread(&l, 1, sizeof(l), fi) != sizeof(l))
+                       goto fail_io;
                l = SWAP32(l);
                if (l != 0 && i > 1)
                        pregapOffset = msf2sec(ti[i].start);
 
                // get the track length
-               fread(&l, 1, sizeof(unsigned int), fi);
+               if (fread(&l, 1, sizeof(l), fi) != sizeof(l))
+                       goto fail_io;
                l = SWAP32(l);
                sec2msf(l, ti[i].length);
 
                offset += 0x50;
        }
-
        fclose(fi);
        return 0;
+fail_io:
+#ifndef NDEBUG
+       SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__);
+#endif
+       fclose(fi);
+       return -1;
 }
 
 static int handlepbp(const char *isofile) {
@@ -776,14 +695,16 @@ static int handlepbp(const char *isofile) {
                unsigned int dontcare[6];
        } index_entry;
        char psar_sig[11];
-       unsigned int t, cd_length, cdimg_base;
-       unsigned int offsettab[8], psisoimg_offs;
+       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;
 
        numtracks = 0;
@@ -794,20 +715,23 @@ static int handlepbp(const char *isofile) {
                goto fail_io;
        }
 
-       ret = fseek(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;
-       fread(psar_sig, 1, sizeof(psar_sig), cdHandle);
+       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 = fseek(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;
                }
 
@@ -829,15 +753,16 @@ static int handlepbp(const char *isofile) {
                if (cdrIsoMultidiskSelect >= cdrIsoMultidiskCount)
                        cdrIsoMultidiskSelect = 0;
 
-               psisoimg_offs += offsettab[cdrIsoMultidiskSelect];
+               psisoimg_offs += SWAP32(offsettab[cdrIsoMultidiskSelect]);
 
-               ret = fseek(cdHandle, psisoimg_offs, SEEK_SET);
+               ret = fseeko(cdHandle, psisoimg_offs, SEEK_SET);
                if (ret != 0) {
-                       SysPrintf("failed to seek to %x\n", psisoimg_offs);
+                       SysPrintf("failed to seek to %llx\n", (long long)psisoimg_offs);
                        goto fail_io;
                }
 
-               fread(psar_sig, 1, sizeof(psar_sig), cdHandle);
+               if (fread(psar_sig, 1, sizeof(psar_sig), cdHandle) != sizeof(psar_sig))
+                       goto fail_io;
                psar_sig[10] = 0;
        }
 
@@ -847,23 +772,26 @@ static int handlepbp(const char *isofile) {
        }
 
        // seek to TOC
-       ret = fseek(cdHandle, psisoimg_offs + 0x800, SEEK_SET);
+       ret = fseeko(cdHandle, psisoimg_offs + 0x800, SEEK_SET);
        if (ret != 0) {
-               SysPrintf("failed to seek to %x\n", psisoimg_offs + 0x800);
+               SysPrintf("failed to seek to %llx\n", (long long)psisoimg_offs + 0x800);
                goto fail_io;
        }
 
        // first 3 entries are special
        fseek(cdHandle, sizeof(toc_entry), SEEK_CUR);
-       fread(&toc_entry, 1, sizeof(toc_entry), cdHandle);
+       if (fread(&toc_entry, 1, sizeof(toc_entry), cdHandle) != sizeof(toc_entry))
+               goto fail_io;
        numtracks = btoi(toc_entry.index1[0]);
 
-       fread(&toc_entry, 1, sizeof(toc_entry), cdHandle);
+       if (fread(&toc_entry, 1, sizeof(toc_entry), cdHandle) != sizeof(toc_entry))
+               goto fail_io;
        cd_length = btoi(toc_entry.index1[0]) * 60 * 75 +
                btoi(toc_entry.index1[1]) * 75 + btoi(toc_entry.index1[2]);
 
        for (i = 1; i <= numtracks; i++) {
-               fread(&toc_entry, 1, sizeof(toc_entry), cdHandle);
+               if (fread(&toc_entry, 1, sizeof(toc_entry), cdHandle) != sizeof(toc_entry))
+                       goto fail_io;
 
                ti[i].type = (toc_entry.type == 1) ? CDDA : DATA;
 
@@ -883,7 +811,7 @@ static int handlepbp(const char *isofile) {
        sec2msf(t, ti[numtracks].length);
 
        // seek to ISO index
-       ret = fseek(cdHandle, psisoimg_offs + 0x4000, SEEK_SET);
+       ret = fseeko(cdHandle, psisoimg_offs + 0x4000, SEEK_SET);
        if (ret != 0) {
                SysPrintf("failed to seek to ISO index\n");
                goto fail_io;
@@ -909,19 +837,28 @@ 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;
 
 fail_index:
        free(compr_img->index_table);
        compr_img->index_table = NULL;
+       goto done;
+
 fail_io:
+       SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__);
+       rewind(cdHandle);
+
+done:
        if (compr_img != NULL) {
                free(compr_img);
                compr_img = NULL;
@@ -941,6 +878,7 @@ static int handlecbin(const char *isofile) {
                unsigned char rsv_06[2];
        } ciso_hdr;
        const char *ext = NULL;
+       unsigned int *index_table = NULL;
        unsigned int index = 0, plain;
        int i, ret;
 
@@ -952,18 +890,18 @@ static int handlecbin(const char *isofile) {
        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 = fseek(cdHandle, ciso_hdr.header_size, SEEK_SET);
+               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;
                }
        }
 
@@ -975,37 +913,129 @@ static int handlecbin(const char *isofile) {
        compr_img->current_block = (unsigned int)-1;
 
        compr_img->index_len = ciso_hdr.total_bytes / ciso_hdr.block_size;
-       compr_img->index_table = malloc((compr_img->index_len + 1) * sizeof(compr_img->index_table[0]));
-       if (compr_img->index_table == NULL)
+       index_table = malloc((compr_img->index_len + 1) * sizeof(index_table[0]));
+       if (index_table == NULL)
                goto fail_io;
 
-       ret = fread(compr_img->index_table, sizeof(compr_img->index_table[0]), compr_img->index_len, cdHandle);
+       ret = fread(index_table, sizeof(index_table[0]), compr_img->index_len, cdHandle);
        if (ret != compr_img->index_len) {
                SysPrintf("failed to read index table\n");
                goto fail_index;
        }
 
+       compr_img->index_table = malloc((compr_img->index_len + 1) * sizeof(compr_img->index_table[0]));
+       if (compr_img->index_table == NULL)
+               goto fail_index;
+
        for (i = 0; i < compr_img->index_len + 1; i++) {
-               index = compr_img->index_table[i];
+               index = index_table[i];
                plain = index & 0x80000000;
                index &= 0x7fffffff;
-               compr_img->index_table[i] = (index << ciso_hdr.align) | plain;
+               compr_img->index_table[i] = (off_t)index << ciso_hdr.align;
+               if (plain)
+                       compr_img->index_table[i] |= OFF_T_MSB;
        }
-       if ((long long)index << ciso_hdr.align >= 0x80000000ll)
-               SysPrintf("warning: ciso img too large, expect problems\n");
 
        return 0;
 
 fail_index:
-       free(compr_img->index_table);
-       compr_img->index_table = NULL;
+       free(index_table);
 fail_io:
        if (compr_img != NULL) {
                free(compr_img);
                compr_img = NULL;
        }
+       rewind(cdHandle);
+       return -1;
+}
+
+#ifdef HAVE_CHD
+static int handlechd(const char *isofile) {
+       int frame_offset = 150;
+       int file_offset = 0;
+
+       chd_img = calloc(1, sizeof(*chd_img));
+       if (chd_img == NULL)
+               goto fail_io;
+
+       if(chd_open(isofile, CHD_OPEN_READ, NULL, &chd_img->chd) != CHDERR_NONE)
+               goto fail_io;
+
+       if (Config.CHD_Precache && (chd_precache(chd_img->chd) != CHDERR_NONE))
+               goto fail_io;
+
+       chd_img->header = chd_get_header(chd_img->chd);
+
+       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[0] = (unsigned int)-1;
+       chd_img->current_hunk[1] = (unsigned int)-1;
+
+       cddaBigEndian = TRUE;
+
+       numtracks = 0;
+       memset(ti, 0, sizeof(ti));
+
+       while (1)
+       {
+               struct {
+                       char type[64];
+                       char subtype[32];
+                       char pgtype[32];
+                       char pgsub[32];
+                       uint32_t track;
+                       uint32_t frames;
+                       uint32_t pregap;
+                       uint32_t postgap;
+               } md = {};
+               char meta[256];
+               uint32_t meta_size = 0;
+
+               if (chd_get_metadata(chd_img->chd, CDROM_TRACK_METADATA2_TAG, numtracks, meta, sizeof(meta), &meta_size, NULL, NULL) == CHDERR_NONE)
+                       sscanf(meta, CDROM_TRACK_METADATA2_FORMAT, &md.track, md.type, md.subtype, &md.frames, &md.pregap, md.pgtype, md.pgsub, &md.postgap);
+               else if (chd_get_metadata(chd_img->chd, CDROM_TRACK_METADATA_TAG, numtracks, meta, sizeof(meta), &meta_size, NULL, NULL) == CHDERR_NONE)
+                       sscanf(meta, CDROM_TRACK_METADATA_FORMAT, &md.track, md.type, md.subtype, &md.frames);
+               else
+                       break;
+
+               SysPrintf("chd: %s\n", meta);
+
+               if (md.track == 1) {
+                       if (!strncmp(md.subtype, "RW", 2)) {
+                               subChanMixed = TRUE;
+                               if (!strcmp(md.subtype, "RW_RAW"))
+                                       subChanRaw = TRUE;
+                       }
+               }
+
+               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 + md.pregap;
+
+               // XXX: what about postgap?
+               frame_offset += md.frames;
+               file_offset += md.frames;
+               numtracks++;
+       }
+
+       if (numtracks)
+               return 0;
+
+fail_io:
+       if (chd_img != NULL) {
+               free(chd_img->buffer);
+               free(chd_img);
+               chd_img = NULL;
+       }
        return -1;
 }
+#endif
 
 // this function tries to get the .sub file of the given .img
 static int opensubfile(const char *isoname) {
@@ -1030,44 +1060,81 @@ static int opensubfile(const char *isoname) {
 }
 
 static int opensbifile(const char *isoname) {
-       char            sbiname[MAXPATHLEN];
+       char            sbiname[MAXPATHLEN], disknum[MAXPATHLEN] = "0";
        int             s;
 
        strncpy(sbiname, isoname, sizeof(sbiname));
        sbiname[MAXPATHLEN - 1] = '\0';
        if (strlen(sbiname) >= 4) {
+               if (cdrIsoMultidiskCount > 1) {
+                       sprintf(disknum, "_%i.sbi", cdrIsoMultidiskSelect + 1);
+                       strcpy(sbiname + strlen(sbiname) - 4, disknum);
+               }
+               else
                strcpy(sbiname + strlen(sbiname) - 4, ".sbi");
        }
        else {
                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);
-       fread(subbuffer, 1, SUB_FRAMESIZE, f);
+       if (ret <= 0)
+               goto fail_io;
+       return ret;
 
-       if (subChanRaw) DecodeRawSubData();
+fail_io:
+       //SysPrintf("File IO error %d, base %u, sector %u\n", errno, base, sector);
+       return -1;
+}
 
-       return ret;
+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;
+
+       return SUB_FRAMESIZE;
+
+fail_io:
+       SysPrintf("subchannel: file IO error %d, sector %u\n", errno, sector);
+       return -1;
 }
 
-static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+static int uncompress2_pcsx(void *out, unsigned long *out_size, void *in, unsigned long in_size)
 {
        static z_stream z;
        int ret = 0;
@@ -1101,10 +1168,13 @@ static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned lo
 static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector)
 {
        unsigned long cdbuffer_size, cdbuffer_size_expect;
-       unsigned int start_byte, size;
+       unsigned int size;
        int is_compressed;
+       off_t start_byte;
        int ret, block;
 
+       if (!cdHandle)
+               return -1;
        if (base)
                sector += base / 2352;
 
@@ -1121,16 +1191,16 @@ static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector)
                return -1;
        }
 
-       start_byte = compr_img->index_table[block] & 0x7fffffff;
-       if (fseek(cdHandle, start_byte, SEEK_SET) != 0) {
-               SysPrintf("seek error for block %d at %x: ",
-                       block, start_byte);
+       start_byte = compr_img->index_table[block] & ~OFF_T_MSB;
+       if (fseeko(cdHandle, start_byte, SEEK_SET) != 0) {
+               SysPrintf("seek error for block %d at %llx: ",
+                       block, (long long)start_byte);
                perror(NULL);
                return -1;
        }
 
-       is_compressed = !(compr_img->index_table[block] & 0x80000000);
-       size = (compr_img->index_table[block + 1] & 0x7fffffff) - start_byte;
+       is_compressed = !(compr_img->index_table[block] & OFF_T_MSB);
+       size = (compr_img->index_table[block + 1] & ~OFF_T_MSB) - start_byte;
        if (size > sizeof(compr_img->buff_compressed)) {
                SysPrintf("block %d is too large: %u\n", block, size);
                return -1;
@@ -1146,7 +1216,7 @@ static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector)
        if (is_compressed) {
                cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift;
                cdbuffer_size = cdbuffer_size_expect;
-               ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
+               ret = uncompress2_pcsx(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
                if (ret != 0) {
                        SysPrintf("uncompress failed with %d for block %d, sector %d\n",
                                        ret, block, sector);
@@ -1167,11 +1237,76 @@ finish:
        return CD_FRAMESIZE_RAW;
 }
 
+#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;
+
+       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[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_buffer * chd_img->header->hunkbytes);
+               chd_img->current_hunk[chd_img->current_buffer] = hunk;
+       }
+
+       if (dest != cdbuffer) // copy avoid HACK
+               memcpy(dest, chd_get_sector(chd_img->current_buffer, chd_img->sector_in_hunk),
+                       CD_FRAMESIZE_RAW);
+       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
@@ -1179,14 +1314,20 @@ 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) {
        return compr_img->buff_raw[compr_img->sector_in_blk] + 12;
 }
 
-static unsigned char * CALLBACK ISOgetBuffer(void) {
+#ifdef HAVE_CHD
+static unsigned char * CALLBACK ISOgetBuffer_chd(void) {
+       return chd_get_sector(chd_img->current_buffer, chd_img->sector_in_hunk) + 12;
+}
+#endif
+
+unsigned char * CALLBACK ISOgetBuffer(void) {
        return cdbuffer + 12;
 }
 
@@ -1195,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]);
        }
@@ -1205,17 +1347,25 @@ static void PrintTracks(void) {
 // file for playback
 static long CALLBACK ISOopen(void) {
        boolean isMode1ISO = FALSE;
+       char alt_bin_filename[MAXPATHLEN];
+       const char *bin_filename;
+       char image_str[1024];
+       off_t size_main;
 
-       if (cdHandle != NULL) {
+       if (cdHandle || chd_img) {
                return 0; // it's already open
        }
 
        cdHandle = fopen(GetIsoFile(), "rb");
        if (cdHandle == NULL) {
+               SysPrintf(_("Could't open '%s' for reading: %s\n"),
+                       GetIsoFile(), strerror(errno));
                return -1;
        }
+       size_main = get_size(cdHandle);
 
-       SysPrintf(_("Loaded CD Image: %s"), GetIsoFile());
+       snprintf(image_str, sizeof(image_str) - 6*4 - 1,
+               "Loaded CD Image: %s", GetIsoFile());
 
        cddaBigEndian = FALSE;
        subChanMixed = FALSE;
@@ -1226,65 +1376,99 @@ static long CALLBACK ISOopen(void) {
 
        CDR_getBuffer = ISOgetBuffer;
        cdimg_read_func = cdread_normal;
+       cdimg_read_sub_func = NULL;
 
-       if (parsecue(GetIsoFile()) == 0) {
-               SysPrintf("[+cue]");
-       }
-       else if (parsetoc(GetIsoFile()) == 0) {
-               SysPrintf("[+toc]");
+       if (parsetoc(GetIsoFile()) == 0) {
+               strcat(image_str, "[+toc]");
        }
        else if (parseccd(GetIsoFile()) == 0) {
-               SysPrintf("[+ccd]");
+               strcat(image_str, "[+ccd]");
        }
        else if (parsemds(GetIsoFile()) == 0) {
-               SysPrintf("[+mds]");
+               strcat(image_str, "[+mds]");
+       }
+       else if (parsecue(GetIsoFile()) == 0) {
+               strcat(image_str, "[+cue]");
        }
        if (handlepbp(GetIsoFile()) == 0) {
-               SysPrintf("[pbp]");
+               strcat(image_str, "[+pbp]");
                CDR_getBuffer = ISOgetBuffer_compr;
                cdimg_read_func = cdread_compressed;
        }
        else if (handlecbin(GetIsoFile()) == 0) {
-               SysPrintf("[cbin]");
+               strcat(image_str, "[+cbin]");
                CDR_getBuffer = ISOgetBuffer_compr;
                cdimg_read_func = cdread_compressed;
        }
+#ifdef HAVE_CHD
+       else if (handlechd(GetIsoFile()) == 0) {
+               strcat(image_str, "[+chd]");
+               CDR_getBuffer = ISOgetBuffer_chd;
+               cdimg_read_func = cdread_chd;
+               cdimg_read_sub_func = cdread_sub_chd;
+               fclose(cdHandle);
+               cdHandle = NULL;
+       }
+#endif
 
        if (!subChanMixed && opensubfile(GetIsoFile()) == 0) {
-               SysPrintf("[+sub]");
+               strcat(image_str, "[+sub]");
        }
        if (opensbifile(GetIsoFile()) == 0) {
-               SysPrintf("[+sbi]");
+               strcat(image_str, "[+sbi]");
+       }
+
+       // maybe user selected metadata file instead of main .bin ..
+       bin_filename = GetIsoFile();
+       if (cdHandle && size_main < 2352 * 0x10) {
+               static const char *exts[] = { ".bin", ".BIN", ".img", ".IMG" };
+               FILE *tmpf = NULL;
+               size_t i;
+               char *p;
+
+               strncpy(alt_bin_filename, bin_filename, sizeof(alt_bin_filename));
+               alt_bin_filename[MAXPATHLEN - 1] = '\0';
+               if (strlen(alt_bin_filename) >= 4) {
+                       p = alt_bin_filename + strlen(alt_bin_filename) - 4;
+                       for (i = 0; i < sizeof(exts) / sizeof(exts[0]); i++) {
+                               strcpy(p, exts[i]);
+                               tmpf = fopen(alt_bin_filename, "rb");
+                               if (tmpf != NULL)
+                                       break;
+                       }
+               }
+               if (tmpf != NULL) {
+                       bin_filename = alt_bin_filename;
+                       fclose(cdHandle);
+                       cdHandle = tmpf;
+                       size_main = get_size(cdHandle);
+               }
        }
 
        // guess whether it is mode1/2048
-       fseek(cdHandle, 0, SEEK_END);
-       if (ftell(cdHandle) % 2048 == 0) {
+       if (cdHandle && cdimg_read_func == cdread_normal && size_main % 2048 == 0) {
                unsigned int modeTest = 0;
-               fseek(cdHandle, 0, SEEK_SET);
-               fread(&modeTest, 4, 1, cdHandle);
+               if (!fread(&modeTest, sizeof(modeTest), 1, cdHandle)) {
+                       SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__);
+               }
                if (SWAP32(modeTest) != 0xffffff00) {
-                       SysPrintf("[2048]");
+                       strcat(image_str, "[2048]");
                        isMode1ISO = TRUE;
                }
        }
-       fseek(cdHandle, 0, SEEK_SET);
 
-       SysPrintf(".\n");
+       SysPrintf("%s.\n", image_str);
 
        PrintTracks();
 
-       if (subChanMixed)
+       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(GetIsoFile(), "rb");
+               cdimg_read_sub_func = NULL;
        }
-       cdda_cur_sector = 0;
-       cdda_file_offset = 0;
 
        return 0;
 }
@@ -1300,7 +1484,6 @@ static long CALLBACK ISOclose(void) {
                fclose(subHandle);
                subHandle = NULL;
        }
-       stopCDDA();
        cddaHandle = NULL;
 
        if (compr_img != NULL) {
@@ -1308,6 +1491,15 @@ static long CALLBACK ISOclose(void) {
                free(compr_img);
                compr_img = NULL;
        }
+       
+#ifdef HAVE_CHD
+       if (chd_img != NULL) {
+               chd_close(chd_img->chd);
+               free(chd_img->buffer);
+               free(chd_img);
+               chd_img = NULL;
+       }
+#endif
 
        for (i = 1; i <= numtracks; i++) {
                if (ti[i].handle != NULL) {
@@ -1402,100 +1594,66 @@ static void DecodeRawSubData(void) {
 // read track
 // time: byte 0 - minute; byte 1 - second; byte 2 - frame
 // uses bcd format
-static long CALLBACK ISOreadTrack(unsigned char *time) {
+static boolean CALLBACK ISOreadTrack(unsigned char *time) {
        int sector = MSF2SECT(btoi(time[0]), btoi(time[1]), btoi(time[2]));
        long ret;
 
-       if (cdHandle == NULL) {
-               return -1;
-       }
+       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)
-               return -1;
-
-       if (subHandle != NULL) {
-               fseek(subHandle, sector * SUB_FRAMESIZE, SEEK_SET);
-               fread(subbuffer, 1, SUB_FRAMESIZE, subHandle);
-
-               if (subChanRaw) DecodeRawSubData();
-       }
+       if (ret < 12*2 + 2048)
+               return 0;
 
-       return 0;
+       return 1;
 }
 
 // plays cdda audio
 // sector: byte 0 - minute; byte 1 - second; byte 2 - frame
 // does NOT uses bcd format
 static long CALLBACK ISOplay(unsigned char *time) {
-       unsigned int i;
-
-       if (numtracks <= 1)
-               return 0;
-
-       // find the track
-       cdda_cur_sector = msf2sec((char *)time);
-       for (i = numtracks; i > 1; i--) {
-               cdda_first_sector = msf2sec(ti[i].start);
-               if (cdda_first_sector <= cdda_cur_sector + 2 * 75)
-                       break;
-       }
-       cdda_file_offset = ti[i].start_offset;
-
-       // find the file that contains this track
-       for (; i > 1; i--)
-               if (ti[i].handle != NULL)
-                       break;
-
-       cddaHandle = ti[i].handle;
-
-       if (SPU_playCDDAchannel != NULL)
-               startCDDA();
-
        return 0;
 }
 
 // stops cdda audio
 static long CALLBACK ISOstop(void) {
-       stopCDDA();
        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;
 }
@@ -1503,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);
@@ -1523,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);
@@ -1572,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);
 }