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

trunk/src/winmm/waveoutdaud.cpp

@@ -12 +12 @@
  */
 
-
-/****************************************************************************
- * Includes                                                                 *
- ****************************************************************************/
-
-
+/******************************************************************************/
+// Includes
+/******************************************************************************/
 
 #define  INCL_BASE
@@ -57 +54 @@
                   : WaveOut(pwfx, fdwOpen, nCallback, dwInstance)
 {
+    hSem = 0;
+    hDAudioDrv = 0;
+    hThread = 0;
+    dwThreadID = 0;
+    bytesReturned = 0;
+    fUnderrun = 0;
+}
+/******************************************************************************/
+/******************************************************************************/
+DAudioWaveOut::~DAudioWaveOut()
+{
+    DAUDIO_CMD cmd;
+
+    if(hThread)
+        callback(WOM_CLOSE, 0, 0);
+
+    if(hDAudioDrv) {
+        cmd.Thread.hSemaphore = hSem;
+        sendIOCTL(DAUDIO_DEREGISTER_THREAD, &cmd);
+        sendIOCTL(DAUDIO_CLOSE, &cmd);
+        DosClose(hDAudioDrv);
+        hDAudioDrv = 0;
+    }
+    if(hSem) {
+        DosPostEventSem(hSem);
+        DosCloseEventSem(hSem);
+    }
+}
+/******************************************************************************/
+/******************************************************************************/
+MMRESULT DAudioWaveOut::open()
+{
     APIRET          rc;
     ULONG           action;
@@ -64 +93 @@
     ULONG           ParmLength = 0, DataLength;
 
-    fUnderrun = FALSE;
-    hSem      = 0;
-
-    dprintf(("DAudioWaveOut::DAudioWaveOut"));
+    dprintf(("DAudioWaveOut::open"));
 
     rc = DosOpen(szPDDName, &hDAudioDrv, &action, 0,
@@ -75 +101 @@
     if(rc) {
         dprintf(("DosOpen failed with error %d\n", rc));
-        ulError = MMSYSERR_NODRIVER;
-        goto fail;
+        return MMSYSERR_NODRIVER;
     }
 
     DataLength = sizeof(init);
 
-    init.lSRate         = pwfx->nSamplesPerSec;
-    init.lBitsPerSRate  = pwfx->wBitsPerSample;
-    init.sChannels      = pwfx->nChannels;
+    init.lSRate         = SampleRate;
+    init.lBitsPerSRate  = BitsPerSample;
+    init.sChannels      = nChannels;
     init.sMode          = PCM;  //todo!!
 
@@ -90 +115 @@
     if(rc) {
         dprintf(("DosDevIOCtl failed with error %d\n", rc));
-        ulError = MMSYSERR_NODRIVER;
-        goto fail;
+        return MMSYSERR_NODRIVER;
     }
     if(init.sReturnCode != 0) {
         dprintf(("init.sReturnCode = %d\n", init.sReturnCode));
-        ulError = MMSYSERR_NODRIVER;
-        goto fail;
+        return MMSYSERR_NODRIVER;
     }
 
@@ -102 +125 @@
     if(rc) {
         dprintf(("DosCreateEventSem failed with error %d\n", rc));
-        ulError = MMSYSERR_NODRIVER;
-        goto fail;
+        return MMSYSERR_NODRIVER;
     }
     cmd.Thread.hSemaphore = hSem;
@@ -110 +132 @@
     if(rc) {
         dprintf(("DosDevIOCtl failed with error %d\n", rc));
-        ulError = MMSYSERR_NODRIVER;
-        goto fail;
+        return MMSYSERR_NODRIVER;
     }
 
     hThread = CreateThread(NULL, 0x4000, (LPTHREAD_START_ROUTINE)DAudioThreadHandler,
                            (LPVOID)this, 0, &dwThreadID);
+    if (!hThread) {
+        dprintf(("CreateThread failed\n"));
+        return MMSYSERR_NODRIVER;
+    }
 
     setVolume(volume);
-
-    if(!ulError)
-        callback(WOM_OPEN, 0, 0);
-
-fail:
-    return;
-}
-/******************************************************************************/
-/******************************************************************************/
-DAudioWaveOut::~DAudioWaveOut()
-{
-    DAUDIO_CMD cmd;
-
-    if(!ulError)
-        callback(WOM_CLOSE, 0, 0);
-
-    if(hDAudioDrv) {
-        cmd.Thread.hSemaphore = hSem;
-        sendIOCTL(DAUDIO_DEREGISTER_THREAD, &cmd);
-        sendIOCTL(DAUDIO_CLOSE, &cmd);
-        DosClose(hDAudioDrv);
-        hDAudioDrv = 0;
-    }
-    if(hSem) {
-        DosPostEventSem(hSem);
-        DosCloseEventSem(hSem);
-    }
+    callback(WOM_OPEN, 0, 0);
+
+    return(MMSYSERR_NOERROR);
 }
 /******************************************************************************/
@@ -235 +236 @@
     fUnderrun = FALSE;
 
-    bytesPlayed = bytesCopied = bytesReturned = 0;
+    bytesReturned = 0;
 
     return rc;
@@ -271 +272 @@
     fUnderrun = FALSE;
 
-    bytesPlayed = bytesCopied = bytesReturned = 0;
+    bytesReturned = 0;
     queuedbuffers = 0;
 
@@ -409 +410 @@
  LPWAVEHDR whdr = wavehdr;
 
-    dprintf2(("WINMM: handler buf %X done (play %d/%d, cop %d, ret %d)", whdr, bytesPlayed, getPosition(), bytesCopied, bytesReturned));
+    dprintf2(("WINMM: handler buf %X done (play %d, ret %d)", whdr, getPosition(), bytesReturned));
 
     if(State != STATE_PLAYING || whdr == NULL)