Changeset 1404 for trunk/src

Timestamp:

Oct 22, 1999, 8:09:16 PM (26 years ago)

Author:

sandervl

Message:

Implemented correct waveOutGetNumDevs

Location:

trunk/src/winmm

Files:

• dwaveout.cpp (modified) (8 diffs)
• dwaveout.h (modified) (2 diffs)
• makefile (modified) (2 diffs)
• time.cpp (modified) (3 diffs)
• waveout.cpp (modified) (2 diffs)

trunk/src/winmm/dwaveout.cpp

@@ -1 @@
-/* $Id: dwaveout.cpp,v 1.7 1999-09-23 09:35:24 sandervl Exp $ */
+/* $Id: dwaveout.cpp,v 1.8 1999-10-22 18:09:15 sandervl Exp $ */
 
 /*
@@ -56 +56 @@
    this->dwInstance = dwInstance;
 
-   callback((ULONG)this, WOM_OPEN, dwInstance, 0, 0);
+   if(!ulError)
+        callback((ULONG)this, WOM_OPEN, dwInstance, 0, 0);
 }
 /******************************************************************************/
@@ -66 +67 @@
    this->hwndCallback = hwndCallback;
 
-   PostMessageA(hwndCallback, WOM_OPEN, 0, 0);
+   if(!ulError)
+        PostMessageA(hwndCallback, WOM_OPEN, 0, 0);
 }
 /******************************************************************************/
@@ -133 +135 @@
 #endif
     mciError(rc);
-    ulError = MMSYSERR_NOTENABLED;
+    ulError = MMSYSERR_NODRIVER;
    }
    if(rc == 0) {
@@ -178 +180 @@
    MCI_GENERIC_PARMS    GenericParms;
 
-   // Generic parameters
-   GenericParms.hwndCallback = 0;   //hwndFrame
-
-   // Stop the playback.
-   mciSendCommand(DeviceId, MCI_STOP,MCI_WAIT, (PVOID)&GenericParms,0);
-
-   mciSendCommand(DeviceId,
+   if(!ulError) {
+        // Generic parameters
+        GenericParms.hwndCallback = 0;   //hwndFrame
+
+        // Stop the playback.
+        mciSendCommand(DeviceId, MCI_STOP,MCI_WAIT, (PVOID)&GenericParms,0);
+
+        mciSendCommand(DeviceId,
                   MCI_BUFFER,
                   MCI_WAIT | MCI_DEALLOCATE_MEMORY,
@@ -190 +193 @@
                   0);
 
-   // Generic parameters
-   GenericParms.hwndCallback = 0;   //hwndFrame
-
-   // Close the device
-   mciSendCommand(DeviceId, MCI_CLOSE, MCI_WAIT, (PVOID)&GenericParms, 0);
+        // Generic parameters
+        GenericParms.hwndCallback = 0;   //hwndFrame
+
+        // Close the device
+        mciSendCommand(DeviceId, MCI_CLOSE, MCI_WAIT, (PVOID)&GenericParms, 0);
+   }
 
    if(wmutex)
-    wmutex->enter(VMUTEX_WAIT_FOREVER);
+        wmutex->enter(VMUTEX_WAIT_FOREVER);
 
    State = STATE_STOPPED;
@@ -215 +219 @@
     wmutex->leave();
 
-   if(callback) {
-    callback((ULONG)this, WOM_CLOSE, dwInstance, 0, 0);
-   }
-   else
-   if(hwndCallback)
-    PostMessageA(hwndCallback, WOM_CLOSE, 0, 0);
+   if(!ulError) {
+        if(callback) {
+                callback((ULONG)this, WOM_CLOSE, dwInstance, 0, 0);
+        }
+        else
+        if(hwndCallback)
+                PostMessageA(hwndCallback, WOM_CLOSE, 0, 0);
+   }
 
    if(wmutex)
@@ -237 +243 @@
 {
   return(ulError);
+}
+/******************************************************************************/
+/******************************************************************************/
+int DartWaveOut::getNumDevices()
+{
+ MCI_GENERIC_PARMS  GenericParms;
+ MCI_AMP_OPEN_PARMS AmpOpenParms;
+ APIRET rc;
+
+   // Setup the open structure, pass the playlist and tell MCI_OPEN to use it
+   memset(&AmpOpenParms,0,sizeof(AmpOpenParms));
+
+   AmpOpenParms.usDeviceID = ( USHORT ) 0;
+   AmpOpenParms.pszDeviceType = ( PSZ ) MCI_DEVTYPE_AUDIO_AMPMIX;
+
+   rc = mciSendCommand(0, MCI_OPEN,
+                       MCI_WAIT | MCI_OPEN_TYPE_ID | MCI_OPEN_SHAREABLE,
+                       (PVOID) &AmpOpenParms,
+                       0);
+
+   if(rc) {
+        return 0; //no devices present
+   }
+
+   // Generic parameters
+   GenericParms.hwndCallback = 0;   //hwndFrame
+
+   // Close the device
+   mciSendCommand(AmpOpenParms.usDeviceID, MCI_CLOSE, MCI_WAIT, (PVOID)&GenericParms, 0);
+   
+   return 1;
 }
 /******************************************************************************/

trunk/src/winmm/dwaveout.h

@@ -1 @@
-/* $Id: dwaveout.h,v 1.4 1999-08-24 21:21:11 phaller Exp $ */
+/* $Id: dwaveout.h,v 1.5 1999-10-22 18:09:16 sandervl Exp $ */
 
 /*
@@ -48 +48 @@
 
   static BOOL find(DartWaveOut *dwave);
+  static int  getNumDevices();
 
 protected:

trunk/src/winmm/makefile

@@ -1 @@
-# $Id: makefile,v 1.11 1999-10-05 19:24:00 phaller Exp $
+# $Id: makefile,v 1.12 1999-10-22 18:09:16 sandervl Exp $
 
 #
@@ -69 +69 @@
 
 clean:
-        $(RM) *.obj *.lib *.dll *~ *.map *.pch
+        $(RM) *.obj *.lib *.dll *.map *.pch
         $(RM) $(PDWIN32_BIN)\$(TARGET).dll
         $(RM) $(PDWIN32_LIB)\$(TARGET).lib

trunk/src/winmm/time.cpp

@@ -1 @@
-/* $Id: time.cpp,v 1.4 1999-08-31 20:25:17 phaller Exp $ */
+/* $Id: time.cpp,v 1.5 1999-10-22 18:09:16 sandervl Exp $ */
 
 /*
@@ -15 +15 @@
  * Includes                                                                 *
  ****************************************************************************/
-
 #include <os2win.h>
 #include <odinwrap.h>
@@ -221 +220 @@
  *****************************************************************************/
 
-ODINFUNCTION0(DWORD, timeGetTime)
+DWORD WIN32API timeGetTime()
 {
   return O32_timeGetTime();

trunk/src/winmm/waveout.cpp

@@ -1 @@
-/* $Id: waveout.cpp,v 1.4 1999-08-19 18:46:05 phaller Exp $ */
+/* $Id: waveout.cpp,v 1.5 1999-10-22 18:09:16 sandervl Exp $ */
 
 /*
@@ -283 +283 @@
 ODINFUNCTION0(UINT, waveOutGetNumDevs)
 {
-  return 1;
+  return DartWaveOut::getNumDevices();
 }
 /******************************************************************************/