Changeset 193 for trunk/classes/mm-progs/MMPlayer/mmplayer.c

Timestamp:

Jun 29, 2024, 11:53:08 PM (14 months ago)

Author:

gyoung

Message:

Fix the media file identification code so the internal audio player plays MIDI files

File:

• trunk/classes/mm-progs/MMPlayer/mmplayer.c (modified) (3 diffs)

trunk/classes/mm-progs/MMPlayer/mmplayer.c

@@ -51 +51 @@
 #include "mmprogs_defaults.h"
 #include "sys_funcs.h"
+
+#if 0
+#define  _PMPRINTF_
+#include "PMPRINTF.H"
+#endif
 
 #ifndef OPEN_DEFAULT
@@ -1101 +1106 @@
 ULONG mmIdentifyFile(char* chrFile)
 {
-  MMIOINFO mmioInfo;
-  MMFORMATINFO mmFormatInfo;
+  MMIOINFO mmioInfo = {0};
+  MMFORMATINFO mmFormatInfo = {0};
   FOURCC fourCC;
-
-
-  if(MMIO_SUCCESS!=mmioIdentifyFile(chrFile, &mmioInfo, &mmFormatInfo, &fourCC, 0,0))
+  INT rc;
+
+  rc=mmioIdentifyFile(chrFile, &mmioInfo, &mmFormatInfo, &fourCC, 0,0);
+  if(rc!=MMIO_SUCCESS)
     {
+#ifdef _PMPRINTF_
+      DebugHereIAm();
+#endif
       return 0;
     }
-
+#ifdef _PMPRINTF_
+  Pmpf(("MediaType %u", mmFormatInfo.ulMediaType));
+#endif
   if(mmFormatInfo.ulMediaType==MMIO_MEDIATYPE_MIDI)
     return 1; /* Midi */
@@ -1158 +1169 @@
           ++chrPtrName;
 
-        if((rc=mmIdentifyFile(chrSourceName))==0)
+        rc=mmIdentifyFile(chrSourceName);
+        if(rc==0)
           {
-            /* FIXME: Identify error !!!*/
+#ifdef _PMPRINTF_
+            DebugHereIAm();
+#endif
+            /* FIXME: Identify error !!!*/
 
           };
-
+#ifdef _PMPRINTF_
+        Pmpf(("rc %u", rc));
+#endif
         if(rc==1)
-          {
-            /* It's a MIDI file */
+          {
+            /* It's a MIDI file */
             bIsMidi=TRUE;
           }