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

Timestamp:

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

Author:

sandervl

Message:

PD: CD Track fixes

File:

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

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);