Changeset 9232 for trunk/src/dsound/dart.cpp

Timestamp:

Sep 14, 2002, 10:31:25 AM (23 years ago)

Author:

sandervl

Message:

YD: Load MMPM2 (MDM.DLL) on demand

File:

• trunk/src/dsound/dart.cpp (modified) (14 diffs)

trunk/src/dsound/dart.cpp

@@ -1 @@
-/* $Id: dart.cpp,v 1.5 2001-04-20 13:22:37 phaller Exp $ */
+/* $Id: dart.cpp,v 1.6 2002-09-14 08:31:24 sandervl Exp $ */
 /*
  *  Dart Interface..
@@ -21 +21 @@
 #include "dart.h"
 #include "dsmixer.h"
+
+#include "initdsound.h"
 
 #include <misc.h>
@@ -60 +62 @@
      if( fIsPlaying == FALSE /*&& lLastBuff == 0*/ )
      {
-       mciSendCommand(usDeviceID, MCI_STOP, MCI_WAIT, NULL, 0);
+       dsmciSendCommand(usDeviceID, MCI_STOP, MCI_WAIT, NULL, 0);
        return TRUE;
      }
@@ -119 +121 @@
    AmpOpenParms.pszDeviceType = (PSZ)MAKEULONG(MCI_DEVTYPE_AUDIO_AMPMIX, (USHORT)device);
 
-   rc = mciSendCommand(0, MCI_OPEN, MCI_WAIT | MCI_OPEN_TYPE_ID, (PVOID)&AmpOpenParms, 0);
+   rc = dsmciSendCommand(0, MCI_OPEN, MCI_WAIT | MCI_OPEN_TYPE_ID, (PVOID)&AmpOpenParms, 0);
    if (rc != MCIERR_SUCCESS) {
       dprintf(("DSOUND-DART: MCI_OPEN %d", rc));
@@ -137 +139 @@
    MixSetupParms.pmixEvent        = OS2_Dart_Update;
 
-   rc = mciSendCommand(usDeviceID, MCI_MIXSETUP, MCI_WAIT | MCI_MIXSETUP_INIT,
+   rc = dsmciSendCommand(usDeviceID, MCI_MIXSETUP, MCI_WAIT | MCI_MIXSETUP_INIT,
                       (PVOID)&MixSetupParms, 0);
    if (rc != MCIERR_SUCCESS) {
@@ -157 +159 @@
    BufferParms.pBufList       = pMixBuffers;
 
-   rc = mciSendCommand(usDeviceID, MCI_BUFFER, MCI_WAIT | MCI_ALLOCATE_MEMORY,
+   rc = dsmciSendCommand(usDeviceID, MCI_BUFFER, MCI_WAIT | MCI_ALLOCATE_MEMORY,
                                 (PVOID)&BufferParms, 0);
    if ( ULONG_LOWD(rc) != MCIERR_SUCCESS ) {
       dprintf(("DSOUND-DART: MCI_BUFFER (Alloc) %d", rc));
-      mciSendCommand(*pusDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
+      dsmciSendCommand(*pusDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
       return DSERR_OUTOFMEMORY;
    }
@@ -199 +201 @@
    BufferParms = (MCI_BUFFER_PARMS*)vpBuffParms;
 
-   rc = mciSendCommand(usDeviceID, MCI_BUFFER, MCI_WAIT | MCI_DEALLOCATE_MEMORY, BufferParms, 0);
+   rc = dsmciSendCommand(usDeviceID, MCI_BUFFER, MCI_WAIT | MCI_DEALLOCATE_MEMORY, BufferParms, 0);
    if (rc != MCIERR_SUCCESS) {
       dprintf(("DSOUND-DART: MCI_BUFFER (Close) %d", rc));
    }
-   rc = mciSendCommand(usDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
+   rc = dsmciSendCommand(usDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
    if (rc != MCIERR_SUCCESS) {
       dprintf(("DSOUND-DART: MCI_CLOSE (Close) %d", rc));
@@ -257 +259 @@
 
    /* Dealloc to avoid the 5511 error */
-   rc = mciSendCommand(*pusDeviceID, MCI_BUFFER, MCI_WAIT | MCI_DEALLOCATE_MEMORY,
+   rc = dsmciSendCommand(*pusDeviceID, MCI_BUFFER, MCI_WAIT | MCI_DEALLOCATE_MEMORY,
                        BufferParms, 0);
    if (rc != MCIERR_SUCCESS) {
@@ -264 +266 @@
    }
 
-   rc = mciSendCommand(*pusDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
+   rc = dsmciSendCommand(*pusDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
    if (rc != MCIERR_SUCCESS) {
       dprintf(("DSOUND-DART: MCI_CLOSE (SetFormat) %d", rc));
@@ -275 +277 @@
    AmpOpenParms.pszDeviceType = (PSZ)MAKEULONG(MCI_DEVTYPE_AUDIO_AMPMIX, (USHORT)device);
 
-   rc = mciSendCommand(0, MCI_OPEN, MCI_WAIT | MCI_OPEN_TYPE_ID, (PVOID)&AmpOpenParms, 0);
+   rc = dsmciSendCommand(0, MCI_OPEN, MCI_WAIT | MCI_OPEN_TYPE_ID, (PVOID)&AmpOpenParms, 0);
    if (rc != MCIERR_SUCCESS) {
       dprintf(("DSOUND-DART: MCI_OPEN %d", rc));
@@ -292 +294 @@
    MixSetup->pmixEvent        = OS2_Dart_Update;
 
-   rc = mciSendCommand(*pusDeviceID, MCI_MIXSETUP, MCI_WAIT | MCI_MIXSETUP_INIT,
+   rc = dsmciSendCommand(*pusDeviceID, MCI_MIXSETUP, MCI_WAIT | MCI_MIXSETUP_INIT,
                        (PVOID)MixSetup, 0);
    if (rc != MCIERR_SUCCESS) {
@@ -307 +309 @@
    pMixBuffers->pBuffer        = NULL;
 
-   rc = mciSendCommand(*pusDeviceID, MCI_BUFFER, MCI_WAIT | MCI_ALLOCATE_MEMORY,
+   rc = dsmciSendCommand(*pusDeviceID, MCI_BUFFER, MCI_WAIT | MCI_ALLOCATE_MEMORY,
                        (PVOID)BufferParms, 0);
    if (rc != MCIERR_SUCCESS) {
       dprintf(("DSOUND-DART: MCI_BUFFER_ALLOCATE_MEMORY (SetFormat) %d", rc));
-      mciSendCommand(*pusDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
+      dsmciSendCommand(*pusDeviceID, MCI_CLOSE, MCI_WAIT, NULL, 0);
       memset(pMixBuffers, 0, sizeof(MCI_MIX_BUFFER) * ulNumDartBuffs);
       return DSERR_OUTOFMEMORY;
@@ -360 +362 @@
    // buffer causing Dart to start again..
 
-   //rc = mciSendCommand(usDeviceID, MCI_STOP, MCI_WAIT, NULL, 0);
+   //rc = dsmciSendCommand(usDeviceID, MCI_STOP, MCI_WAIT, NULL, 0);
    //if (rc != MCIERR_SUCCESS) {
    //   { FILE *dbf; dbf=fopen("log.log", "a"); fprintf( dbf, "Error in MCI_STOP...\n"); fclose(dbf); }
@@ -384 +386 @@
   if (playing == TRUE) 
   {
-    rc = mciSendCommand(usDeviceID, MCI_RESUME, MCI_WAIT, NULL, 0);
+    rc = dsmciSendCommand(usDeviceID, MCI_RESUME, MCI_WAIT, NULL, 0);
     if (rc != MCIERR_SUCCESS) 
     {