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

Timestamp:

Jul 23, 2000, 6:21:57 PM (25 years ago)

Author:

sandervl

Message:

update

File:

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

sbliveos2/trunk/drv16/wavestrm.cpp

@@ -167 +167 @@
         }
         space = OSS16_StreamGetSpace(this);
-        if(space > 128) {
-                space -= 128;
-        }
         while(space) {
                 byteswritten = AddBuffer(space);
@@ -186 +183 @@
 ULONG WAVESTREAM::AddBuffer(ULONG space)
 {
-   PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhDone.Head();
+   PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhDone.Tail();
    ULONG pdataBuf;
    ULONG Buff_left, byteswritten;
@@ -193 +190 @@
         pTemp = (PSTREAMBUFFER)qhInProcess.Head();
    }
-   if(!pTemp) return 0;
+   if(!pTemp) {
+        dprintf4(("AddBuffer: pTemp == NULL"));
+        return 0;
+   }
 
    // get the buffer pointer and amount of data remaining
@@ -209 +209 @@
    pTemp->ulBuffpos += byteswritten;
 
-   if (!qhDone.Head() || pTemp != qhDone.Head()) {
-      qhDone.PushOnTail(qhInProcess.PopHead());
+   if(pTemp != qhDone.Tail()) {
+        qhDone.PushOnTail(qhInProcess.PopHead());
    }
    dprintf4(("AddBuffer %lx size %d, bytes written %d", pdataBuf, (USHORT)Buff_left, (USHORT)byteswritten));
@@ -221 +221 @@
 BOOL WAVESTREAM::_vReadAudioBuf(void)
 {
-   PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhDone.Head();
+   PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhInProcess.Head();
    ULONG pdataBuf;
    ULONG Buff_left, bytesread;
 
-   if(!pTemp || pTemp->ulBuffpos >= (pTemp->ulBuffsz & 0xFFFFFFFC)) {
-        pTemp = (PSTREAMBUFFER)qhInProcess.Head();
-   }
    if(!pTemp) return FALSE;
 
@@ -246 +243 @@
    _ulBytesProcessed += bytesread;
 
-   if (!qhDone.Head() || pTemp != qhDone.Head()) {
+   if(pTemp->ulBuffpos == pTemp->ulBuffsz) {
         qhDone.PushOnTail(qhInProcess.PopHead());
-   }
-   if(pTemp->ulBuffpos == pTemp->ulBuffsz) {
+        ReturnBuffer();
         dprintf4(("_vReadAudioBuf return buffer %lx size %ld, bytes read %ld", (ULONG)pTemp->pBuffptr, pTemp->ulBuffsz, bytesread));
-        ReturnBuffer();
    }
 
@@ -277 +272 @@
         }
         bytesinc           = ulCurBytesProcessed - _ulBytesProcessed;
+        dprintf4(("Process: %lx %x", ulCurBytesProcessed, (USHORT)bytesinc));
         if(ulCurBytesProcessed < _ulBytesProcessed) {
                 dprintf(("WARNING: Process: Current pos %ld incr %d", ulCurBytesProcessed, (USHORT)bytesinc));
@@ -396 +392 @@
 {
  PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhInProcess.Head();
- ULONG         fragsize;
-
-#ifdef DEBUG
-   int oldlevel = dbglevel;
-   dbglevel = 4;
-#endif
+ ULONG fragsize;
+
    // configure the wave device
    ((PWAVEAUDIO)pahw)->ConfigDev(this, &_configinfo);
@@ -439 +431 @@
         OSS16_StartStream(this);
    }
-#ifdef DEBUG
-   dbglevel = oldlevel;
-#endif
 
    //Must set volume after adding buffers (voices inside sblive driver might not
@@ -540 +529 @@
    _ulBytesProcessed = 0;
    _ulTimeBase = 0;
+
    fUnderrun = FALSE;