X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fcdriso.c;h=1e9adedeb3497e3901915e53c8a0aefa961df104;hp=e68ecf3dd9362725d4ffbaae40ceec4ad2e7fb97;hb=0ce47d46e07dfb02f3eeef481b963927beeee481;hpb=38b8102cdfde55d7afa20bf95c7698d39407379b

diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index e68ecf3d..1e9adede 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -159,6 +159,12 @@ static void *playthread(void *param)
 #else
 		usleep(d * 1000);
 #endif
+		// HACK: stop feeding data while emu is paused
+		extern int stop;
+		if (stop) {
+			usleep(100000);
+			continue;
+		}
 
 		t = GetTickCount() + CDDA_FRAMETIME;
 
@@ -733,6 +739,7 @@ static long CALLBACK ISOopen(void) {
 	if (numtracks > 1 && ti[1].handle == NULL) {
 		ti[1].handle = fopen(GetIsoFile(), "rb");
 	}
+	cddaCurOffset = cddaStartOffset = 0;
 
 	return 0;
 }
@@ -797,7 +804,17 @@ static long CALLBACK ISOgetTN(unsigned char *buffer) {
 //  byte 1 - second
 //  byte 2 - minute
 static long CALLBACK ISOgetTD(unsigned char track, unsigned char *buffer) {
-	if (numtracks > 0 && track <= numtracks) {
+	if (track == 0) {
+		// CD length according pcsxr-svn (done a bit different here)
+		unsigned int sect;
+		unsigned char time[3];
+		sect = msf2sec(ti[numtracks].start) + msf2sec(ti[numtracks].length);
+		sec2msf(sect, time);
+		buffer[2] = time[0];
+		buffer[1] = time[1];
+		buffer[0] = time[2];
+	}
+	else if (numtracks > 0 && track <= numtracks) {
 		buffer[2] = ti[track].start[0];
 		buffer[1] = ti[track].start[1];
 		buffer[0] = ti[track].start[2];
@@ -920,13 +937,14 @@ static long CALLBACK ISOgetStatus(struct CdrStat *stat) {
 	if (playing) {
 		stat->Type = 0x02;
 		stat->Status |= 0x80;
-		sec = (cddaStartOffset + cddaCurOffset) / CD_FRAMESIZE_RAW;
-		sec2msf(sec, (char *)stat->Time);
 	}
 	else {
 		stat->Type = 0x01;
 	}
 
+	sec = (cddaStartOffset + cddaCurOffset) / CD_FRAMESIZE_RAW;
+	sec2msf(sec, (char *)stat->Time);
+
 	return 0;
 }