Changeset 178 for sbliveos2/trunk/drv16/wavestrm.cpp

Timestamp:

Apr 30, 2001, 11:08:00 PM (24 years ago)

Author:

sandervl

Message:

DirectAudio interface updates

File:

• sbliveos2/trunk/drv16/wavestrm.cpp (modified) (11 diffs)

sbliveos2/trunk/drv16/wavestrm.cpp

@@ -25 +25 @@
 #include <os2me.h>
 #include <audio.h>                // for #define MIDI
+#include <include.h>
 
 #include "wavestrm.hpp"
@@ -154 +155 @@
 // if this is a write stream call _vFillAudioBuf
 //
-void WAVESTREAM::AddBuffers(void)
+#pragma off (unreferenced)
+void WAVESTREAM::AddBuffers(BOOL fFirst)
+#pragma on (unreferenced)
 {
  ULONG space, byteswritten;
@@ -303 +306 @@
                 ReturnBuffer();
         }
-        AddBuffers();
+        AddBuffers(FALSE);
         break;
    }
@@ -316 +319 @@
 }
 
-ULONG WAVESTREAM::Write(PSTREAMBUF pbuf, ULONG uLength)
+#pragma off (unreferenced)
+ULONG WAVESTREAM::Write(PSTREAMBUF pbuf, ULONG uLength, BOOL fLooping)
+#pragma on (unreferenced)
 {
  PSTREAMBUFFER pStreamBuf = new STREAMBUFFER(uLength, pbuf);
@@ -330 +335 @@
         fUnderrun = FALSE;
         OSS16_StreamReset(this);
-        AddBuffers();
+        AddBuffers(TRUE);
         if(ulStreamType == STREAM_WAVE_PLAY)
                 OSS16_SetWaveOutVol(this, volume);
@@ -399 +404 @@
 }
 
+ULONG WAVESTREAM::GetCurrentWritePos(void)
+{
+   ULONG writepos = 0;
+
+   cli();
+   PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhDone.Tail();
+
+   if(!pTemp) {
+       pTemp = (PSTREAMBUFFER)qhInProcess.Head();
+   }
+   if(pTemp) {
+       writepos = pTemp->ulBuffpos;
+   }
+   sti();
+   return writepos;
+}
+
 //
 // SetCurrentTime
@@ -415 +437 @@
 {
  PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhInProcess.Head();
- ULONG fragsize;
 
    // configure the wave device
@@ -445 +466 @@
    //Adding the first buffer also starts playback
    if(ulStreamType == STREAM_WAVE_PLAY) {
-        AddBuffers();
+        AddBuffers(TRUE);
    }
    else {
@@ -464 +485 @@
 
 }
+
 ULONG  WAVESTREAM::StopStream(PCONTROL_PARM pControl)
 {
@@ -521 +543 @@
    ulStreamState = STREAM_STREAMING;
    //Adding the first buffer also starts playback
-   AddBuffers();
+   AddBuffers(TRUE);
 
    return NO_ERROR;
@@ -527 +549 @@
 }
 
-void WAVESTREAM::SetInputSrc(int src)
-{ 
-   inputsrc = src; 
-}
-
-void WAVESTREAM::SetInputGain(ULONG gain)
-{ 
-   inputgain = gain; 
-}
-
-void WAVESTREAM::SetVolume(ULONG volume)
-{ 
-   this->volume = volume; 
-   if(ulStreamState == STREAM_STREAMING && ulStreamType == STREAM_WAVE_PLAY) {
-        OSS16_SetWaveOutVol(this, volume);
+
+BOOL WAVESTREAM::SetProperty(int type, ULONG value, ULONG reserved)
+{
+   switch(type) {
+   case PROPERTY_VOLUME:
+       volume = value; 
+       if(ulStreamState == STREAM_STREAMING && ulStreamType == STREAM_WAVE_PLAY) {
+           OSS16_SetWaveOutVol(this, volume);
+       }
+       break;
+
+   case PROPERTY_INPUTSRC:
+       inputsrc = value;
+       break;
+
+   case PROPERTY_INPUTGAIN:
+       inputgain = value;
+       break;
+
+   default:
+       return STREAM::SetProperty(type, value, reserved);
+
+   }
+   return TRUE;
+}
+
+ULONG WAVESTREAM::GetProperty(int type) 
+{
+   switch(type) {
+   case PROPERTY_FREQUENCY:
+       return _configinfo.ulSampleRate;
+
+   case PROPERTY_INPUTSRC:
+       return inputsrc;
+
+   case PROPERTY_INPUTGAIN:
+       return inputgain;
+
+   default:
+       return STREAM::GetProperty(type);
    }
 }