Changeset 5005 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

PD: CD Track fixes

Location:

trunk/src/winmm/mcicda

Files:

• cdrom.cpp (modified) (5 diffs)
• cdrom.h (modified) (1 diff)
• os2cdrom.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;
 }
 

trunk/src/winmm/mcicda/cdrom.h

@@ -98 +98 @@
 BOOL os2GetCDStatus(HFILE hfOS2Handle, ULONG  *ulStatus);
 BOOL os2GetCDAudioStatus(HFILE hfOS2Handle, USHORT  *usStatus);
-ULONG  os2CDQueryTrackStartSector( HFILE hfDrive, ULONG numTrack);
+ULONG  os2CDQueryTrackStartSector( HFILE hfDrive, ULONG numTrack, BOOL *flAudio);
 BOOL os2CDEject(HFILE hfDrive);
 BOOL os2CDCloseTray(HFILE hfDrive);

trunk/src/winmm/mcicda/os2cdrom.cpp

@@ -4 +4 @@
  *
  * Copyright 2000    Chris Wohlgemuth
- *
+ *           2001    Przemyslaw Dobrowolski
  * Project Odin Software License can be found in LICENSE.TXT
  *
@@ -27 +27 @@
 typedef struct
 {
+    int ADR_data_for_track:4;   // ADR data for track
+    int preemphasis:1;          // 0 = Audio without preemphasis
+                                // 1 = Audio with preemphasis
+    int cdda_permitted:1;       // 0 = Digital copy prohibited
+                                // 1 = Digital copy permitted
+    int type_of_track:1;        // 0 = Audio track
+                                // 1 = Data track
+    int channels:1;             // 0 = Two-channel audio
+                               // 1 = Four-channel audio
+}TRACKTYPE;
+
+typedef struct
+{
         ULONG ulTrackAddress;
-        UCHAR ucTCInfo;
+        TRACKTYPE track_type;
 }CDTRACKINFO;
 
@@ -157 +170 @@
         return 0;//Error
     }
-                
-    if(trackInfo.ucTCInfo & 0x40) {
-        return -1;//It's a data track
-    }
+
+// PD: Don't return error when data track is found.
+//  if(trackInfo.ucTCInfo & 0x40) {
+//      return -1;//It's a data track
+//  }
+
     *ulLeadOut=cdInfo.ulLeadOut;
     return cdInfo.ucLastTrack-cdInfo.ucFirstTrack+1;
@@ -214 +229 @@
 /* Returns sector info of track #numTrack */
 /* Starting with track 0 */
-ULONG  os2CDQueryTrackStartSector( HFILE hfDrive, ULONG numTrack)
+ULONG  os2CDQueryTrackStartSector( HFILE hfDrive, ULONG numTrack, BOOL *pflAudio)
 {       
     ULONG ulParamLen;
@@ -250 +265 @@
             if(rc) 
                 break;//Error
+
+           *pflAudio=!trackInfo[0].track_type.type_of_track;
+
         }else 
             return _CDCalculateSector((MSF*)&cdInfo.ulLeadOut);