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

Timestamp:

Feb 22, 2010, 2:44:21 PM (16 years ago)

Author:

rlwalsh

Message:

add FlashWaveOut class to winmm - see Ticket #2

File:

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

trunk/src/winmm/wavein.cpp

@@ -14 +14 @@
  */
 
-
-/****************************************************************************
- * Includes                                                                 *
- ****************************************************************************/
+/******************************************************************************/
+// Includes
+/******************************************************************************/
 
 #include <os2win.h>
@@ -34 +33 @@
 #include "dbglocal.h"
 
-
 /******************************************************************************/
 /******************************************************************************/
@@ -47 +45 @@
         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)
-        {
              return(MMSYSERR_NOERROR);
-        }
-        else return(WAVERR_BADFORMAT);
+
+        return(WAVERR_BADFORMAT);
     }
 
@@ -62 +58 @@
     *phwi = (HWAVEOUT)new DartWaveIn(pwfx, fdwOpen, dwCallback, dwInstance);
 
-    if(*phwi == NULL) {
+    if(*phwi == NULL)
         return(MMSYSERR_NODRIVER);
-    }
-
-    rc = ((DartWaveIn *)*phwi)->getError();
+
+    rc = ((DartWaveIn *)*phwi)->open();
     if(rc != MMSYSERR_NOERROR) {
         delete (DartWaveIn *)*phwi;