Changeset 21358 for trunk/src/winmm/waveout.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/waveout.cpp (modified) (5 diffs)

trunk/src/winmm/waveout.cpp

@@ -1 +1 @@
 /* $Id: waveout.cpp,v 1.27 2003-07-16 15:47:24 sandervl Exp $ */
-//#undef DEBUG
+
 /*
  * Wave out MM apis
@@ -13 +13 @@
  */
 
-
-/****************************************************************************
- * Includes                                                                 *
- ****************************************************************************/
+/******************************************************************************/
+// Includes
+/******************************************************************************/
 
 #include <os2win.h>
@@ -29 +28 @@
 #include "waveoutdart.h"
 #include "waveoutdaud.h"
+#include "waveoutflash.h"
 #include "misc.h"
 #include "winmm.h"
@@ -36 +36 @@
 #include "dbglocal.h"
 
-
 /******************************************************************************/
 /******************************************************************************/
@@ -42 +41 @@
                             DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen)
 {
-  MMRESULT rc;
-
-    if(fMMPMAvailable == FALSE) return MMSYSERR_NODRIVER;
-
-    if(pwfx == NULL)
+    MMRESULT rc;
+
+    if (fMMPMAvailable == FALSE)
+        return MMSYSERR_NODRIVER;
+
+    if (pwfx == NULL)
         return(WAVERR_BADFORMAT);
 
-    if(fdwOpen & WAVE_FORMAT_QUERY)
-    {
-        if(DartWaveOut::queryFormat(pwfx->wFormatTag, pwfx->nChannels, pwfx->nSamplesPerSec,
-                                    pwfx->wBitsPerSample) == TRUE) {
-                return(MMSYSERR_NOERROR);
-        }
-        else    return(WAVERR_BADFORMAT);
-    }
-
-    if(phwo == NULL)
+    if (fdwOpen & WAVE_FORMAT_QUERY) {
+        if (WaveOut::queryFormat(pwfx->wFormatTag, pwfx->nChannels,
+                                 pwfx->nSamplesPerSec,
+                                 pwfx->wBitsPerSample) == TRUE) {
+            return (MMSYSERR_NOERROR);
+        }
+        return (WAVERR_BADFORMAT);
+    }
+
+    if (phwo == NULL)
         return(MMSYSERR_INVALPARAM);
 
-    if(DAudioWaveOut::isDirectAudioAvailable()) {
-         *phwo = (HWAVEOUT)new DAudioWaveOut(pwfx, fdwOpen, dwCallback, dwInstance);
-    }
-    else *phwo = (HWAVEOUT)new DartWaveOut(pwfx, fdwOpen, dwCallback, dwInstance);
-
-    if(*phwo == NULL) {
+    if (ODIN_IsFlashAudioEnabled())
+        *phwo = (HWAVEOUT)new FlashWaveOut(pwfx, fdwOpen, dwCallback, dwInstance);
+    else
+    if (DAudioWaveOut::isDirectAudioAvailable())
+        *phwo = (HWAVEOUT)new DAudioWaveOut(pwfx, fdwOpen, dwCallback, dwInstance);
+    else
+        *phwo = (HWAVEOUT)new DartWaveOut(pwfx, fdwOpen, dwCallback, dwInstance);
+
+    if(*phwo == NULL)
         return(MMSYSERR_NODRIVER);
-    }
-
-    rc = ((WaveOut *)*phwo)->getError();
-    if(rc != MMSYSERR_NOERROR) {
+
+    rc = ((WaveOut *)*phwo)->open();
+    if (rc != MMSYSERR_NOERROR)
         delete (WaveOut *)*phwo;
-        return(rc);
-    }
-    return(MMSYSERR_NOERROR);
+
+    return rc;
 }
 /******************************************************************************/