Changeset 5005 for trunk/src/winmm/mcicda/cdrom.cpp

Timestamp:

Jan 21, 2001, 2:36:43 PM (25 years ago)

Author:

sandervl

Message:

PD: CD Track fixes

File:

• trunk/src/winmm/mcicda/cdrom.cpp (modified) (5 diffs)

trunk/src/winmm/mcicda/cdrom.cpp

@@ -216 +216 @@
         case 0:
             SetLastError(ERROR_WRONG_DISK);  
-            return -1;
+            return 1;
         default:
             break;
@@ -233 +233 @@
     ULONG               start, last_start = 0;
     int         total_length = 0;
+    BOOL        flAudioTrack;
 
     if(!wcda->hfOS2Handle) {
@@ -282 +283 @@
     
     for (i = 0; i <= wcda->nTracks; i++) {
-        if((start=os2CDQueryTrackStartSector(wcda->hfOS2Handle,i))==0)
+        if((start=os2CDQueryTrackStartSector(wcda->hfOS2Handle,i,&flAudioTrack))==0)
             {
                 WARN("error reading start sector for track %d\n", i+1);
@@ -313 +314 @@
         }
         //if(wcda->ulCDROMStatus & )
-        wcda->lpbTrackFlags[i] = 0; 
+        if (!flAudioTrack)
+          wcda->lpbTrackFlags[i] = CDROM_DATA_TRACK; 
+        else
+          wcda->lpbTrackFlags[i] = 0;
         //TRACE("track #%u flags=%02x\n", i + 1, wcda->lpbTrackFlags[i]);
     }/* for */
@@ -321 +325 @@
     
     return TRUE;
-    
-    dprintf(("MCICDA-CDROM: CDAUDIO_GetTracksInfo not implemented.\n"));
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
 }