notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge several fixes from PCSX Redux and adjust delay for SetLocPending. (#221)
[pcsx_rearmed.git]
/
libpcsxcore
/
cdriso.c
diff --git
a/libpcsxcore/cdriso.c
b/libpcsxcore/cdriso.c
index
9ef594c
..
5aad225
100644
(file)
--- a/
libpcsxcore/cdriso.c
+++ b/
libpcsxcore/cdriso.c
@@
-1480,12
+1480,12
@@
static void DecodeRawSubData(void) {
// read track
// time: byte 0 - minute; byte 1 - second; byte 2 - frame
// uses bcd format
// 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) {
int sector = MSF2SECT(btoi(time[0]), btoi(time[1]), btoi(time[2]));
long ret;
if (cdHandle == NULL) {
- return
-1
;
+ return
0
;
}
if (pregapOffset) {
}
if (pregapOffset) {
@@
-1499,7
+1499,7
@@
static long CALLBACK ISOreadTrack(unsigned char *time) {
ret = cdimg_read_func(cdHandle, 0, cdbuffer, sector);
if (ret < 0)
ret = cdimg_read_func(cdHandle, 0, cdbuffer, sector);
if (ret < 0)
- return
-1
;
+ return
0
;
if (subHandle != NULL) {
fseek(subHandle, sector * SUB_FRAMESIZE, SEEK_SET);
if (subHandle != NULL) {
fseek(subHandle, sector * SUB_FRAMESIZE, SEEK_SET);
@@
-1508,7
+1508,7
@@
static long CALLBACK ISOreadTrack(unsigned char *time) {
if (subChanRaw) DecodeRawSubData();
}
if (subChanRaw) DecodeRawSubData();
}
- return
0
;
+ return
1
;
}
// plays cdda audio
}
// plays cdda audio