Changeset 7196 for trunk/src/winmm/waveoutdart.cpp

Timestamp:

Oct 25, 2001, 12:47:43 AM (24 years ago)

Author:

sandervl

Message:

dynamically load MDM.DLL

File:

• trunk/src/winmm/waveoutdart.cpp (modified) (21 diffs)

trunk/src/winmm/waveoutdart.cpp

@@ -1 @@
-/* $Id: waveoutdart.cpp,v 1.5 2001-06-16 11:35:22 sandervl Exp $ */
+/* $Id: waveoutdart.cpp,v 1.6 2001-10-24 22:47:42 sandervl Exp $ */
 
 /*
@@ -35 +35 @@
 #include "misc.h"
 #include "waveoutdart.h"
+#include "initwinmm.h"
 
 #define DBG_LOCALLOG    DBG_waveoutdart
@@ -80 +81 @@
     AmpOpenParms.pszDeviceType = ( PSZ ) MCI_DEVTYPE_AUDIO_AMPMIX;
 
-    rc = mciSendCommand(0, MCI_OPEN, MCI_WAIT | MCI_OPEN_TYPE_ID | MCI_OPEN_SHAREABLE,
+    rc = mymciSendCommand(0, MCI_OPEN, MCI_WAIT | MCI_OPEN_TYPE_ID | MCI_OPEN_SHAREABLE,
                        (PVOID) &AmpOpenParms, 0);
 
@@ -92 +93 @@
         //Grab exclusive rights to device instance (NOT entire device)
         GenericParms.hwndCallback = 0;  //Not needed, so set to 0
-        rc = mciSendCommand(DeviceId, MCI_ACQUIREDEVICE, MCI_EXCLUSIVE_INSTANCE,
+        rc = mymciSendCommand(DeviceId, MCI_ACQUIREDEVICE, MCI_EXCLUSIVE_INSTANCE,
                             (PVOID)&GenericParms, 0);
         if(rc) {
@@ -118 +119 @@
 
         // Stop the playback.
-        mciSendCommand(DeviceId, MCI_STOP,MCI_WAIT, (PVOID)&GenericParms,0);
-
-        mciSendCommand(DeviceId, MCI_BUFFER,
+        mymciSendCommand(DeviceId, MCI_STOP,MCI_WAIT, (PVOID)&GenericParms,0);
+
+        mymciSendCommand(DeviceId, MCI_BUFFER,
                        MCI_WAIT | MCI_DEALLOCATE_MEMORY,
                        (PVOID)&BufferParms, 0);
@@ -128 +129 @@
 
         // Close the device
-        mciSendCommand(DeviceId, MCI_CLOSE, MCI_WAIT, (PVOID)&GenericParms, 0);
+        mymciSendCommand(DeviceId, MCI_CLOSE, MCI_WAIT, (PVOID)&GenericParms, 0);
     }
 
@@ -173 +174 @@
         MixSetupParms->pmixEvent    = WaveOutHandler;
 
-        rc = mciSendCommand(DeviceId,
+        rc = mymciSendCommand(DeviceId,
                             MCI_MIXSETUP,
                             MCI_WAIT | MCI_MIXSETUP_INIT,
@@ -181 +182 @@
         if ( rc != MCIERR_SUCCESS ) {
             mciError(rc);
-            mciSendCommand(DeviceId, MCI_RELEASEDEVICE, MCI_WAIT,
+            mymciSendCommand(DeviceId, MCI_RELEASEDEVICE, MCI_WAIT,
                            (PVOID)&GenericParms, 0);
             return(MMSYSERR_NOTSUPPORTED);
@@ -217 +218 @@
         }
 
-        rc = mciSendCommand(DeviceId,
+        rc = mymciSendCommand(DeviceId,
                             MCI_BUFFER,
                             MCI_WAIT | MCI_ALLOCATE_MEMORY,
@@ -225 +226 @@
         if(ULONG_LOWD(rc) != MCIERR_SUCCESS) {
             mciError(rc);
-            mciSendCommand(DeviceId, MCI_RELEASEDEVICE, MCI_WAIT,
+            mymciSendCommand(DeviceId, MCI_RELEASEDEVICE, MCI_WAIT,
                           (PVOID)&GenericParms, 0);
             return(MMSYSERR_NOTSUPPORTED);
@@ -303 +304 @@
 
             // Resume the playback.
-            mciSendCommand(DeviceId, MCI_RESUME, MCI_WAIT, (PVOID)&GenericParms, 0);
+            mymciSendCommand(DeviceId, MCI_RESUME, MCI_WAIT, (PVOID)&GenericParms, 0);
 
             //write buffers to DART; starts playback
@@ -337 +338 @@
 
     // Pause the playback.
-    mciSendCommand(DeviceId, MCI_PAUSE, MCI_WAIT, (PVOID)&Params, 0);
+    mymciSendCommand(DeviceId, MCI_PAUSE, MCI_WAIT, (PVOID)&Params, 0);
 
     return(MMSYSERR_NOERROR);
@@ -354 +355 @@
 
     // Stop the playback.
-    mciSendCommand(DeviceId, MCI_STOP, MCI_WAIT, (PVOID)&Params, 0);
+    mymciSendCommand(DeviceId, MCI_STOP, MCI_WAIT, (PVOID)&Params, 0);
 
     State     = STATE_STOPPED;
@@ -378 +379 @@
 
     // Stop the playback.
-    mciSendCommand(DeviceId, MCI_STOP, MCI_WAIT, (PVOID)&Params, 0);
+    mymciSendCommand(DeviceId, MCI_STOP, MCI_WAIT, (PVOID)&Params, 0);
 
     dprintf(("Nr of threads blocked on mutex = %d\n", wmutex.getNrBlocked()));
@@ -450 +451 @@
 
     mciStatus.ulItem = MCI_STATUS_POSITION;
-    rc = mciSendCommand(DeviceId, MCI_STATUS, MCI_STATUS_ITEM|MCI_WAIT, (PVOID)&mciStatus, 0);
+    rc = mymciSendCommand(DeviceId, MCI_STATUS, MCI_STATUS_ITEM|MCI_WAIT, (PVOID)&mciStatus, 0);
     if((rc & 0xFFFF) == MCIERR_SUCCESS) {
         nrbytes = (mciStatus.ulReturn * (getAvgBytesPerSecond()/1000));
@@ -478 +479 @@
     mciOpenParms.pszDeviceType = (PSZ)MCI_DEVTYPE_WAVEFORM_AUDIO;
 
-    rc = mciSendCommand( (USHORT) 0,
+    rc = mymciSendCommand( (USHORT) 0,
                         MCI_OPEN,
                         MCI_WAIT | MCI_OPEN_TYPE_ID,
@@ -498 +499 @@
     mciAudioCaps.ulItem          = MCI_GETDEVCAPS_WAVE_FORMAT;
 
-    rc = mciSendCommand(DeviceId,   /* Device ID    */
+    rc = mymciSendCommand(DeviceId,   /* Device ID    */
                         MCI_GETDEVCAPS,
                         MCI_WAIT | MCI_GETDEVCAPS_EXTENDED | MCI_GETDEVCAPS_ITEM,
@@ -510 +511 @@
 
     // Close the device
-    mciSendCommand(DeviceId,MCI_CLOSE,MCI_WAIT,(PVOID)&GenericParms,0);
+    mymciSendCommand(DeviceId,MCI_CLOSE,MCI_WAIT,(PVOID)&GenericParms,0);
     return(winrc);
 }
@@ -520 +521 @@
     char szError[256] = "";
 
-    mciGetErrorString(ulError, szError, sizeof(szError));
+    mymciGetErrorString(ulError, szError, sizeof(szError));
     dprintf(("WINMM: DartWaveOut: %s\n", szError));
 #endif
@@ -714 +715 @@
   msp.ulLevel = ulVolL;
 
-  mciSendCommand(DeviceId, MCI_SET,
+  mymciSendCommand(DeviceId, MCI_SET,
                  MCI_WAIT | MCI_SET_AUDIO | MCI_SET_VOLUME,
                  &msp, 0);
@@ -726 +727 @@
 #endif
 
-  mciSendCommand(DeviceId, MCI_SET,
+  mymciSendCommand(DeviceId, MCI_SET,
                  MCI_WAIT | MCI_SET_AUDIO | MCI_SET_VOLUME,
                  &msp, 0);