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

Timestamp:

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

Author:

sandervl

Message:

dynamically load MDM.DLL

File:

• trunk/src/winmm/auxos2.cpp (modified) (7 diffs)

trunk/src/winmm/auxos2.cpp

@@ -1 @@
-/* $Id: auxos2.cpp,v 1.8 2000-02-17 14:09:30 sandervl Exp $ */
+/* $Id: auxos2.cpp,v 1.9 2001-10-24 22:47:41 sandervl Exp $ */
 
 /*
@@ -28 +28 @@
 
 #include "auxiliary.h"
+#include "initwinmm.h"
 
 #define DBG_LOCALLOG    DBG_auxos2
@@ -41 +42 @@
  APIRET rc;
 
+  if(fMMPMAvailable == FALSE) return FALSE;
+
   if(auxDeviceId != -1) {
         return TRUE;
@@ -50 +53 @@
   AmpOpenParms.pszDeviceType = ( PSZ ) MCI_DEVTYPE_AUDIO_AMPMIX;
 
-  rc = mciSendCommand(0, MCI_OPEN,
+  rc = mymciSendCommand(0, MCI_OPEN,
                       MCI_WAIT | MCI_OPEN_TYPE_ID | MCI_OPEN_SHAREABLE,
                       (PVOID) &AmpOpenParms,
@@ -74 +77 @@
 
    // Close the device
-   mciSendCommand(auxDeviceId, MCI_CLOSE, MCI_WAIT, (PVOID)&GenericParms, 0);
+   mymciSendCommand(auxDeviceId, MCI_CLOSE, MCI_WAIT, (PVOID)&GenericParms, 0);
 }
 /******************************************************************************/
@@ -84 +87 @@
 
   maudio.ulMasterVolume = (dwVolume*100)/65536;  //TODO: Not correct, should be logartihmic
-  rc = mciSendCommand(auxDeviceId, MCI_MASTERAUDIO, MCI_MASTERVOL |
+  rc = mymciSendCommand(auxDeviceId, MCI_MASTERAUDIO, MCI_MASTERVOL |
                       MCI_WAIT, (PVOID)&maudio,0);
   if(rc) {
@@ -98 +101 @@
  APIRET rc;
 
-  rc = mciSendCommand(auxDeviceId, MCI_MASTERAUDIO, MCI_QUERYCURRENTSETTING |
+  rc = mymciSendCommand(auxDeviceId, MCI_MASTERAUDIO, MCI_QUERYCURRENTSETTING |
                       MCI_MASTERVOL | MCI_WAIT, (PVOID)&maudio,0);
   if(rc) {