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

Timestamp:

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

Author:

sandervl

Message:

Rewrite for DirectAudio interface

File:

• trunk/src/winmm/wavein.cpp (modified) (4 diffs)

trunk/src/winmm/wavein.cpp

@@ -1 @@
-/* $Id: wavein.cpp,v 1.8 2001-03-19 19:28:38 sandervl Exp $ */
+/* $Id: wavein.cpp,v 1.9 2001-03-23 16:23:44 sandervl Exp $ */
 
 /*
@@ -28 +28 @@
 
 #include "winmm.h"
-#include "dwavein.h"
+#include "waveindart.h"
 
 #define DBG_LOCALLOG    DBG_wavein
@@ -48 +48 @@
   MMRESULT rc;
 
-  if(pwfx == NULL)
+    if(pwfx == NULL)
         return(WAVERR_BADFORMAT);
 
-  if(fdwOpen == WAVE_FORMAT_QUERY) {
+    if(fdwOpen == WAVE_FORMAT_QUERY) {
         if(DartWaveIn::queryFormat(pwfx->wFormatTag, pwfx->nChannels, pwfx->nSamplesPerSec,
                                    pwfx->wBitsPerSample) == TRUE) {
@@ -57 +57 @@
         }
         else    return(WAVERR_BADFORMAT);
-  }
-
-  if(phwi == NULL)
+    }
+
+    if(phwi == NULL)
         return(MMSYSERR_INVALPARAM);
 
-  if(fdwOpen == CALLBACK_WINDOW) {
-        *phwi = (HWAVEOUT)new DartWaveIn(pwfx, (HWND)dwCallback);
-  }
-  else
-  if(fdwOpen == CALLBACK_FUNCTION)
-  {
-        *phwi = (HWAVEOUT)new DartWaveIn(pwfx, dwCallback, dwInstance);
-  }
-  else  *phwi = (HWAVEOUT)new DartWaveIn(pwfx);
-
-  if(*phwi == NULL) {
+    *phwi = (HWAVEOUT)new DartWaveIn(pwfx, fdwOpen, dwCallback, dwInstance);
+
+    if(*phwi == NULL) {
         return(MMSYSERR_NODRIVER);
-  }
-
-  rc = ((DartWaveIn *)*phwi)->getError();
-  if(rc != MMSYSERR_NOERROR) {
+    }
+
+    rc = ((DartWaveIn *)*phwi)->getError();
+    if(rc != MMSYSERR_NOERROR) {
         delete (DartWaveIn *)*phwi;
         return(rc);
-  }
-  return(MMSYSERR_NOERROR);
+    }
+    return(MMSYSERR_NOERROR);
 }
 /******************************************************************************/