Changeset 5643 for trunk/src/dsound/waveoutdaud.cpp

Timestamp:

Apr 30, 2001, 11:06:56 PM (24 years ago)

Author:

sandervl

Message:

DirectAudio interface updates

File:

• trunk/src/dsound/waveoutdaud.cpp (modified) (11 diffs)

trunk/src/dsound/waveoutdaud.cpp

@@ -1 @@
-/* $Id: waveoutdaud.cpp,v 1.1 2001-04-27 17:39:49 sandervl Exp $ */
+/* $Id: waveoutdaud.cpp,v 1.2 2001-04-30 21:06:37 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 #include "misc.h"
 #include "waveoutdaud.h"
-
+#include <options.h>
 
 DWORD WIN32API DAudioThreadHandler(LPVOID pUserData);
@@ -39 +39 @@
 /******************************************************************************/
 /******************************************************************************/
-DAudioWaveOut::DAudioWaveOut(LPWAVEFORMATEX pwfx) : ulError(0), hDAudioDrv(0)
+DAudioWaveOut::DAudioWaveOut(LPWAVEFORMATEX pwfx) : 
+        ulError(0), hDAudioDrv(0), fUnderrun(FALSE), State(STATE_STOPPED)
 {
     APIRET          rc;
@@ -48 +49 @@
     ULONG           ParmLength = 0, DataLength;
 
-    fUnderrun = FALSE;
-
     rc = DosOpen("DAUDIO1$", &hDAudioDrv, &action, 0,
                  FILE_NORMAL, FILE_OPEN, OPEN_ACCESS_READWRITE |
@@ -91 +90 @@
     DAUDIO_CMD cmd;
 
+    if(State != STATE_STOPPED) {
+        stop();
+    }
     if(hDAudioDrv) {
         sendIOCTL(DAUDIO_CLOSE, &cmd);
@@ -99 +101 @@
 /******************************************************************************/
 /******************************************************************************/
-MMRESULT DAudioWaveOut::write(LPWAVEHDR pwh, UINT cbwh)
-{
-    DAUDIO_CMD cmd;
-
-    cmd.Buffer.lpBuffer       = (ULONG)pwh->lpData;
-    cmd.Buffer.ulBufferLength = pwh->dwBufferLength;
+MMRESULT DAudioWaveOut::write(LPVOID lpBuffer, UINT ulSize)
+{
+    DAUDIO_CMD cmd;
+
+    cmd.Buffer.lpBuffer       = (ULONG)lpBuffer;
+    cmd.Buffer.ulBufferLength = ulSize;
     if(sendIOCTL(DAUDIO_ADDBUFFER, &cmd)) {
         dprintf(("Unable to add buffer!!!!!"));
@@ -110 +112 @@
     }
 
-    if(State == STATE_STOPPED) {//continue playback
-        restart();
-    }
-    else
-    if(fUnderrun) {
-        dprintf(("Resume playback after underrun"));
-        fUnderrun = FALSE;
-        State = STATE_PLAYING;
-
-        // Resume the playback.
-        resume();
-    }
     return(MMSYSERR_NOERROR);
 }
@@ -187 +177 @@
 /******************************************************************************/
 /******************************************************************************/
-ULONG DAudioWaveOut::getPosition()
+MMRESULT DAudioWaveOut::setProperty(int type, ULONG value)
+{
+    DAUDIO_CMD cmd;
+
+    dprintf(("DAudioWaveOut::setProperty %d %x", type, value));
+
+    cmd.SetProperty.type  = type;
+    cmd.SetProperty.value = type;
+    return sendIOCTL(DAUDIO_SETPROPERTY, &cmd);
+}
+/******************************************************************************/
+/******************************************************************************/
+MMRESULT DAudioWaveOut::setVolume(ULONG ulVol)
+{
+    DAUDIO_CMD cmd;
+
+    //Scale down from 0-64k-1 -> 0-100
+    cmd.Vol.VolumeR = (((ulVol & 0xFFFF0000) >> 16)*100)/0xFFFF;
+    cmd.Vol.VolumeL =  ((ulVol & 0x0000FFFF)       *100)/0xFFFF;
+    return sendIOCTL(DAUDIO_SETVOLUME, &cmd);
+}
+/******************************************************************************/
+/******************************************************************************/
+ULONG DAudioWaveOut::getPosition(PULONG pulWritePos)
 {
     DAUDIO_CMD cmd;
@@ -196 +209 @@
         return 0xFFFFFFFF;
     }
+    *pulWritePos = cmd.Pos.ulWritePos;
     return cmd.Pos.ulCurrentPos;
 }
@@ -253 +267 @@
     HFILE           hDriver;
 
+
     if(!fTested) {
+        if(PROFILE_GetOdinIniInt(SECTION_WINMM, KEY_DIRECTAUDIO, 1) == 0) {
+            fTested = TRUE;
+            return FALSE;
+        }
         rc = DosOpen("DAUDIO1$", &hDriver, &action, 0,
                      FILE_NORMAL, FILE_OPEN, OPEN_ACCESS_READWRITE |
@@ -270 +289 @@
 /******************************************************************************/
 /******************************************************************************/
-MMRESULT DAudioWaveOut::setVolume(ULONG ulVol)
-{
-    DAUDIO_CMD cmd;
-
-    //Scale down from 0-64k-1 -> 0-100
-    cmd.Vol.VolumeR = (((ulVol & 0xFFFF0000) >> 16)*100)/0xFFFF;
-    cmd.Vol.VolumeL =  ((ulVol & 0x0000FFFF)       *100)/0xFFFF;
-    return sendIOCTL(DAUDIO_SETVOLUME, &cmd);
-}
-/******************************************************************************/
-/******************************************************************************/
 MMRESULT DAudioWaveOut::sendIOCTL(ULONG cmd, DAUDIO_CMD *pDataPacket)
 {