Changeset 5358 for trunk/src/winmm/waveout.cpp

Timestamp:

Mar 23, 2001, 5:23:47 PM (24 years ago)

Author:

sandervl

Message:

Rewrite for DirectAudio interface

File:

• trunk/src/winmm/waveout.cpp (modified) (24 diffs)

trunk/src/winmm/waveout.cpp

@@ -1 @@
-/* $Id: waveout.cpp,v 1.19 2001-03-21 12:33:22 sandervl Exp $ */
+/* $Id: waveout.cpp,v 1.20 2001-03-23 16:23:45 sandervl Exp $ */
 //#undef DEBUG
 /*
@@ -27 +27 @@
 #include <unicode.h>
 
-#include "dwaveout.h"
+#include "waveoutdart.h"
 #include "misc.h"
 #include "winmm.h"
@@ -67 +67 @@
         return(MMSYSERR_INVALPARAM);
 
-  if(fdwOpen == CALLBACK_WINDOW) {
-        *phwo = (HWAVEOUT)new DartWaveOut(pwfx, (HWND)dwCallback);
-  }
-  else
-  if(fdwOpen == CALLBACK_FUNCTION)
-  {
-        *phwo = (HWAVEOUT)new DartWaveOut(pwfx, dwCallback, dwInstance);
-  }
-  else  *phwo = (HWAVEOUT)new DartWaveOut(pwfx);
+  *phwo = (HWAVEOUT)new DartWaveOut(pwfx, fdwOpen, dwCallback, dwInstance);
 
   if(*phwo == NULL) {
@@ -81 +73 @@
   }
 
-  rc = ((DartWaveOut *)*phwo)->getError();
+  rc = ((WaveOut *)*phwo)->getError();
   if(rc != MMSYSERR_NOERROR) {
-        delete (DartWaveOut *)*phwo;
+        delete (WaveOut *)*phwo;
         return(rc);
   }
@@ -95 +87 @@
               UINT, cbwh)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwo;
-
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwo;
+
+  if(WaveOut::find(dwave) == TRUE)
   {
         if(!(pwh->dwFlags & WHDR_PREPARED) || pwh->lpData == NULL)
@@ -118 +110 @@
               HWAVEOUT, hwaveout)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwaveout;
-
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwaveout;
+
+  if(WaveOut::find(dwave) == TRUE)
         return(dwave->reset());
   else  return(MMSYSERR_INVALHANDLE);
@@ -129 +121 @@
               HWAVEOUT, hwaveout)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwaveout;
+  WaveOut *dwave = (WaveOut *)hwaveout;
 
   dprintf(("WINMM:waveOutBreakLoop (implemented as reset) %X\n", hwaveout));
-  if(DartWaveOut::find(dwave) == TRUE)
+  if(WaveOut::find(dwave) == TRUE)
         return(dwave->reset());
   else  return(MMSYSERR_INVALHANDLE);
@@ -141 +133 @@
               HWAVEOUT, hwaveout)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwaveout;
-
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwaveout;
+
+  if(WaveOut::find(dwave) == TRUE)
   {
         if(dwave->getState() == STATE_PLAYING)
@@ -158 +150 @@
               HWAVEOUT, hwaveout)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwaveout;
-
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwaveout;
+
+  if(WaveOut::find(dwave) == TRUE)
         return(dwave->pause());
   else  return(MMSYSERR_INVALHANDLE);
@@ -169 +161 @@
               HWAVEOUT, hwaveout)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwaveout;
-
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwaveout;
+
+  if(WaveOut::find(dwave) == TRUE)
         return(dwave->restart());
   else  return(MMSYSERR_INVALHANDLE);
@@ -182 +174 @@
               UINT, cbwh)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwo;
-
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwo;
+
+  if(WaveOut::find(dwave) == TRUE)
   {
         if(pwh->dwFlags & WHDR_INQUEUE)
@@ -203 +195 @@
               UINT, cbwh)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwo;
-
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwo;
+
+  if(WaveOut::find(dwave) == TRUE)
   {
         if(pwh->dwFlags & WHDR_INQUEUE)
@@ -223 +215 @@
               UINT, cbmmt)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwo;
+  WaveOut *dwave = (WaveOut *)hwo;
 
   if(pmmt == NULL)
         return MMSYSERR_INVALPARAM;
 
-  if(DartWaveOut::find(dwave) == TRUE)
+  if(WaveOut::find(dwave) == TRUE)
   {
    ULONG position;
@@ -278 +270 @@
               UINT, cbwoc)
 {
-  if(DartWaveOut::getNumDevices() == 0) {
+  if(WaveOut::getNumDevices() == 0) {
         memset(pwoc, 0, sizeof(*pwoc));
         return MMSYSERR_NODRIVER;
@@ -308 +300 @@
               UINT, cbwoc)
 {
-  if(DartWaveOut::getNumDevices() == 0) {
+  if(WaveOut::getNumDevices() == 0) {
         memset(pwoc, 0, sizeof(*pwoc));
         return MMSYSERR_NODRIVER;
@@ -334 +326 @@
 ODINFUNCTION0(UINT, waveOutGetNumDevs)
 {
-  return DartWaveOut::getNumDevices();
+  return WaveOut::getNumDevices();
 }
 /******************************************************************************/
@@ -380 +372 @@
               LPUINT, puDeviceID)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwo;
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwo;
+  if(WaveOut::find(dwave) == TRUE)
   {
         *puDeviceID = 1;
@@ -394 +386 @@
               LPDWORD, pdwPitch)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwo;
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwo;
+  if(WaveOut::find(dwave) == TRUE)
         return MMSYSERR_NOTSUPPORTED;
   else  return(MMSYSERR_INVALHANDLE);
@@ -405 +397 @@
               DWORD, dwPitch)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwo;
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwo;
+  if(WaveOut::find(dwave) == TRUE)
         return MMSYSERR_NOTSUPPORTED;
   else  return(MMSYSERR_INVALHANDLE);
@@ -416 +408 @@
               LPDWORD, pdwVolume)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwo;
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwo;
+  if(WaveOut::find(dwave) == TRUE)
   {
         if(pdwVolume!=NULL)
@@ -433 +425 @@
               DWORD, dwVolume)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwo;
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwo;
+  if(WaveOut::find(dwave) == TRUE)
   {
     return(dwave->setVolume(dwVolume));
   }
   if(hwo == NULL) {
-    DartWaveOut::setDefaultVolume(dwVolume);
+      WaveOut::setDefaultVolume(dwVolume);
   }
   return MMSYSERR_NOERROR;
@@ -450 +442 @@
               LPDWORD, pdwRate)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwo;
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwo;
+  if(WaveOut::find(dwave) == TRUE)
   {
         return MMSYSERR_NOTSUPPORTED;
@@ -463 +455 @@
               DWORD, dwRate)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwo;
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwo;
+  if(WaveOut::find(dwave) == TRUE)
   {
         return MMSYSERR_NOTSUPPORTED;
@@ -478 +470 @@
               DWORD, dw2)
 {
-  DartWaveOut *dwave = (DartWaveOut *)hwo;
-  if(DartWaveOut::find(dwave) == TRUE)
+  WaveOut *dwave = (WaveOut *)hwo;
+  if(WaveOut::find(dwave) == TRUE)
   {
     return MMSYSERR_NOTSUPPORTED;