Fix missings (cdriso.c->sec?).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@56851 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 29 insertions, 28 deletions

diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index a6812e1e..6e1c4dd5 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -31,9 +31,9 @@
 #include <sys/time.h>
 #endif
 
-#define btoi(b)			((b) / 16 * 10 + (b) % 16) /* BCD to u_char */

-#define itob(i)     ((i)/10*16 + (i)%10)    /* u_char to BCD */

-

+#define btoi(b)			((b) / 16 * 10 + (b) % 16) /* BCD to u_char */
+#define itob(i)     ((i)/10*16 + (i)%10)    /* u_char to BCD */
+
 static FILE *cdHandle = NULL;
 static FILE *cddaHandle = NULL;
 static FILE *subHandle = NULL;
@@ -175,16 +175,17 @@ static void *playthread(void *param)
 
 				s += d;
 
-				fread( subbuffer, 1, SUB_FRAMESIZE, cddaHandle );

+				fread( subbuffer, 1, SUB_FRAMESIZE, cddaHandle );
 			}
 		}
 		else {
 			s = fread(sndbuffer, 1, sizeof(sndbuffer), cddaHandle);
-

-			if (subHandle != NULL) {

-				fseek(subHandle, sec * SUB_FRAMESIZE, SEEK_SET);

-				fread(subbuffer, 1, SUB_FRAMESIZE, subHandle);

-			}

+
+			if (subHandle != NULL) {
+                // FIXME: sec?
+				//fseek(subHandle, sec * SUB_FRAMESIZE, SEEK_SET);
+				//fread(subbuffer, 1, SUB_FRAMESIZE, subHandle);
+			}
 		}
 
 		if (s == 0) {
@@ -747,25 +748,25 @@ static long CALLBACK ISOgetTN(unsigned char *buffer) {
 //  byte 1 - second
 //  byte 2 - minute
 static long CALLBACK ISOgetTD(unsigned char track, unsigned char *buffer) {
-	if( track == 0 ) {

-		unsigned int pos, size;

-		unsigned char time[3];

-

-		// Vib Ribbon: return size of CD

-		// - ex. 20 min, 22 sec, 66 fra

-		pos = ftell( cdHandle );

-		fseek( cdHandle, 0, SEEK_END );

-		size = ftell( cdHandle );

-		fseek( cdHandle, pos, SEEK_SET );

-

-		// relative -> absolute time (+2 seconds)

-		size += 150 * 2352;

-

-		sec2msf( size / 2352, time );

-		buffer[2] = time[0];

-		buffer[1] = time[1];

-		buffer[0] = time[2];

-	}

+	if( track == 0 ) {
+		unsigned int pos, size;
+		unsigned char time[3];
+
+		// Vib Ribbon: return size of CD
+		// - ex. 20 min, 22 sec, 66 fra
+		pos = ftell( cdHandle );
+		fseek( cdHandle, 0, SEEK_END );
+		size = ftell( cdHandle );
+		fseek( cdHandle, pos, SEEK_SET );
+
+		// relative -> absolute time (+2 seconds)
+		size += 150 * 2352;
+
+		sec2msf( size / 2352, 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];