Changeset 483 for OCO/trunk/drv16/waveplay.cpp

Timestamp:

May 6, 2010, 3:08:34 AM (15 years ago)

Author:

David Azarewicz

Message:

Rework buffer management

File:

• OCO/trunk/drv16/waveplay.cpp (modified) (19 diffs)

OCO/trunk/drv16/waveplay.cpp

@@ -189 +189 @@
     }
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::ConfigDev1 SampleRate %ld", pConfigInfo->ulHwSampleRate));
-    dprintf(("ulFirstBufSize %ld", ulFirstBufSize));
-    dprintf(("ulFragsize %ld", pConfigInfo->ulFragsize));
+    dprintf(("WAVEPLAY::ConfigDev SampleRate %ld", pConfigInfo->ulHwSampleRate));
+    dprintf(("WAVEPLAY::ConfigDev ulFirstBufSize=%lx ulFragsize=%lx", ulFirstBufSize, pConfigInfo->ulFragsize));
 #endif
 
@@ -197 +196 @@
     {
         ulFirstBufSize = pConfigInfo->ulFragsize; //no conversion required (see below)
-        if (ulFirstBufSize == 0) 
+        if (ulFirstBufSize == 0)
         {
             DebugInt3();
@@ -206 +205 @@
         }
     }
-    else 
+    else
     {
         //convert size of first buffer
         ulFirstBufSize = ConvertLength(ulFirstBufSize, pConfigInfo);
 #ifdef DEBUG
-        dprintf(("ulFirstBufSize %ld", ulFirstBufSize));
+        dprintf(("ulFirstBufSize %lx", ulFirstBufSize));
 #endif /* DEBUG */
     }
@@ -223 +222 @@
     ulPCMConsumeRate = ConvertLength(pConfigInfo->ulPCMConsumeRate, pConfigInfo);
 #ifdef DEBUG
-    dprintf(("cons rate %ld buf size %ld init rate %ld", ulPCMConsumeRate, ulFirstBufSize, pConfigInfo->ulHwSampleRate));
+    dprintf(("cons rate %lx buf size %lx init rate %ld", ulPCMConsumeRate, ulFirstBufSize, pConfigInfo->ulHwSampleRate));
 #endif /* DEBUG */
 
@@ -237 +236 @@
     {
         while(minimumsize < fragsize) fragsize = fragsize / 2; //
- 
+
             if(fragsize < ulPCMConsumeRate/256)
             {//lower limit; don't accept extremely small buffers
@@ -252 +251 @@
 
 #ifdef DEBUG
-    dprintf(("fragsize %ld", fragsize));
+    dprintf(("fragsize %lx", fragsize));
 #endif
     hwparam.ulSampleRate    = pConfigInfo->ulHwSampleRate;
@@ -288 +287 @@
 
 #ifdef DEBUG
-//    dprintf(("WAVEPLAY::Transfer %ld",ulBytesToTransfer));
+    //dprintf(("WAVEPLAY::Transfer %ld",ulBytesToTransfer));
 #endif
 
@@ -319 +318 @@
         }
     }
-    else 
-    {
-        if(pConfigInfo->pfnConvert) 
+    else
+    {
+        if(pConfigInfo->pfnConvert)
         {
             ULONG ulCvtBufferSize;
@@ -332 +331 @@
             ulBytesToTransfer = CONVERT_LENGTH(ulCvtBufferSize, CONVERSION_INVERT(pConfigInfo->ulConversionFactor));
 
-            if(ulBytesToTransfer & (pConfigInfo->ulSampleSize-1)) 
+            if(ulBytesToTransfer & (pConfigInfo->ulSampleSize-1))
             {
                 dprintf(("Transfer New ulBr %ld" , ulBytesToTransfer));
@@ -349 +348 @@
             //convert back from conversion to 'real'
             *pulBytesTransferred = CONVERT_LENGTH(*pulBytesTransferred, CONVERSION_INVERT(pConfigInfo->ulConversionFactor));
-            if(*pulBytesTransferred & (pConfigInfo->ulSampleSize-1)) 
+            if(*pulBytesTransferred & (pConfigInfo->ulSampleSize-1))
             {
 #ifdef DEBUG
@@ -357 +356 @@
             }
         }
-        else 
+        else
         {
             dprintf(("Transfer Zero pConfigInfo->pfnConvert"));
@@ -374 +373 @@
     OSSRET rc;
     ULONG  Space;
-    ULONG i;
 //    if (!waveOpened) return TRUE;
 
@@ -398 +396 @@
         ulCvtBufferSize &= ~(pConfigInfo->ulHwSampleSize - 1);
 
-        if(ulCvtBufferSize == 0) 
+        if(ulCvtBufferSize == 0)
         {
             *pulBytesTransferred = ulBytesToTransfer;
-            if(pConfigInfo->ulSRatePosition >= pConfigInfo->ulSRateIncrement) 
+            if(pConfigInfo->ulSRatePosition >= pConfigInfo->ulSRateIncrement)
             {
                 pConfigInfo->ulSRatePosition -= pConfigInfo->ulSRateIncrement;
@@ -423 +421 @@
                 ulCvtBufferSize = Space & ~(pConfigInfo->ulHwSampleSize - 1);
         }
-        if ((rc = OSS16_WaveAddBuffer(StreamId, pConfigInfo->pSRateConvBuffer, ulCvtBufferSize, pulBytesTransferred)) != OSSERR_SUCCESS 
+        if ((rc = OSS16_WaveAddBuffer(StreamId, pConfigInfo->pSRateConvBuffer, ulCvtBufferSize, pulBytesTransferred)) != OSSERR_SUCCESS
              ||  *pulBytesTransferred == 0)
         {
-            if(rc == OSSERR_BUFFER_FULL) 
+            if(rc == OSSERR_BUFFER_FULL)
             {
                  GetSpace(StreamId, pConfigInfo, &Space);
@@ -432 +430 @@
             }
 #ifdef DEBUG
-            else 
+            else
                 dprintf(("WPLAY::AddBuffer; %ld rc=%x failed", ulCvtBufferSize, (USHORT)rc));
 #endif
@@ -452 +450 @@
         // if the last sample is still needed for the next run, then adjust sample count and
         // sample rate conversion position
-        if(lSRatePosition < 0) 
+        if(lSRatePosition < 0)
         {
             dprintf4(("WAVEPLAY::AddBuffer; sratepos < 0"));
@@ -458 +456 @@
             pConfigInfo->ulSRatePosition = 0;
         }
-        else 
+        else
         {
             pConfigInfo->ulSRatePosition = (ULONG)lSRatePosition;
@@ -507 +505 @@
 //    if (!waveOpened) return TRUE;
 
-    if(OSS16_WaveGetSpace(StreamId, &space) != OSSERR_SUCCESS) 
+    if(OSS16_WaveGetSpace(StreamId, &space) != OSSERR_SUCCESS)
     {
         *pulStreamSpace = 0;
@@ -529 +527 @@
     ULONG space,cvt;
 
-    if(OSS16_WaveGetHwPtr(StreamId, &space) != OSSERR_SUCCESS) 
+    if(OSS16_WaveGetHwPtr(StreamId, &space) != OSSERR_SUCCESS)
     {
         *pulHwPtr = 0;