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

Timestamp:

Jul 17, 2000, 8:37:33 PM (25 years ago)

Author:

sandervl

Message:

misc updates

File:

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

sbliveos2/trunk/drv16/wavestrm.cpp

@@ -34 +34 @@
 #include "ioctl.h"
 
+#ifndef min
+#define min(a,b) (a>b) ? b : a
+#endif
+
 //
 //  _vRealignBuffer
@@ -152 +156 @@
 void WAVESTREAM::AddBuffers(void)
 {
+ ULONG space, byteswritten;
+
    if (ulStreamType & STREAM_WRITE) {
         if(!qhInProcess.Head() && !qhDone.Head()) {
@@ -160 +166 @@
                 return;
         }
-        AddBuffer();
-        AddBuffer();
+        space = OSS16_StreamGetSpace(this);
+        if(space > 128) {
+                space -= 128;
+        }
+        while(space) {
+                byteswritten = AddBuffer(space);
+                space -= byteswritten;
+                if(byteswritten == 0) break;
+        }       
    }
 }
@@ -171 +184 @@
 // there are buffers on pHead... BEWARE
 //
-void WAVESTREAM::AddBuffer()
+ULONG WAVESTREAM::AddBuffer(ULONG space)
 {
    PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhDone.Head();
@@ -180 +193 @@
         pTemp = (PSTREAMBUFFER)qhInProcess.Head();
    }
-   if(!pTemp) return;
+   if(!pTemp) return 0;
 
    // get the buffer pointer and amount of data remaining
@@ -187 +200 @@
 
    // write the audio buffer
+   Buff_left = min(Buff_left, space);
    byteswritten = OSS16_StreamAddBuffer(this, pdataBuf, Buff_left);
    if(byteswritten == 0) {
-        return; //no more room
-   }
-
-//   dprintf(("AddBuffer %lx size %d, bytes written %d", pdataBuf, (USHORT)Buff_left, (USHORT)byteswritten));
+        return 0; //no more room
+   }
 
    // update the buffer pos counter
@@ -200 +212 @@
       qhDone.PushOnTail(qhInProcess.PopHead());
    }
+   dprintf4(("AddBuffer %lx size %d, bytes written %d", pdataBuf, (USHORT)Buff_left, (USHORT)byteswritten));
+   return byteswritten;
 }
 
@@ -226 +240 @@
    }
 
-////   dprintf(("_vReadAudioBuf %lx size %d, bytes read %d", pdataBuf, Buff_left, bytesread));
+   dprintf4(("_vReadAudioBuf %lx size %d, bytes read %d", pdataBuf, Buff_left, bytesread));
 
    // update the buffer pos counter
@@ -236 +250 @@
    }
    if(pTemp->ulBuffpos == pTemp->ulBuffsz) {
-        dprintf(("_vReadAudioBuf return buffer %lx size %ld, bytes read %ld", (ULONG)pTemp->pBuffptr, pTemp->ulBuffsz, bytesread));
+        dprintf4(("_vReadAudioBuf return buffer %lx size %ld, bytes read %ld", (ULONG)pTemp->pBuffptr, pTemp->ulBuffsz, bytesread));
         ReturnBuffer();
    }
@@ -280 +294 @@
                         //calc position in next buffer
                         bytesinc = ptemp->ulDonepos - ptemp->ulBuffsz;
-////                    dprintf(("Process: Return buffer %lx size %d", ptemp->pBuffptr, ptemp->ulBuffsz));
+                        dprintf3(("Process: Return buffer %lx size %d", ptemp->pBuffptr, ptemp->ulBuffsz));
                         ReturnBuffer();
                 }
@@ -309 +323 @@
 {
    qhInProcess.PushOnTail((PQUEUEELEMENT)new STREAMBUFFER(uLength, pbuf));
-////   dprintf(("WAVESTREAM::Write: Push on tail %lx %d", ((PSTREAMBUFFER)qhInProcess.Head())->pBuffptr, ((PSTREAMBUFFER)qhInProcess.Head())->ulBuffsz));
+   dprintf2(("WAVESTREAM::Write: Push on tail %lx %d", ((PSTREAMBUFFER)qhInProcess.Head())->pBuffptr, ((PSTREAMBUFFER)qhInProcess.Head())->ulBuffsz));
    if(fUnderrun) {
         fUnderrun = FALSE;
@@ -323 +337 @@
 {
    qhInProcess.PushOnTail((PQUEUEELEMENT)new STREAMBUFFER(uLength, pbuf));
-   dprintf(("WAVESTREAM::Read: Push on tail %lx %d", ((PSTREAMBUFFER)qhInProcess.Head())->pBuffptr, ((PSTREAMBUFFER)qhInProcess.Head())->ulBuffsz));
+   dprintf2(("WAVESTREAM::Read: Push on tail %lx %d", ((PSTREAMBUFFER)qhInProcess.Head())->pBuffptr, ((PSTREAMBUFFER)qhInProcess.Head())->ulBuffsz));
    return 0;
 }
@@ -384 +398 @@
  ULONG         fragsize;
 
+#ifdef DEBUG
+   int oldlevel = dbglevel;
+   dbglevel = 4;
+#endif
    // configure the wave device
    ((PWAVEAUDIO)pahw)->ConfigDev(this, &_configinfo);
@@ -421 +439 @@
         OSS16_StartStream(this);
    }
+#ifdef DEBUG
+   dbglevel = oldlevel;
+#endif
 
    //Must set volume after adding buffers (voices inside sblive driver might not