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

Timestamp:

Oct 8, 2008, 11:28:16 PM (17 years ago)

Author:

rjerant

Message:

Add GetHwPtr() to code base

File:

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

OCO/trunk/drv16/waveplay.cpp

@@ -233 +233 @@
     //while the stream is playing.
     ULONG minimumsize = ulFirstBufSize/2;
-    if(minimumsize && minimumsize < fragsize) 
+    if(minimumsize && minimumsize < fragsize)
     {
         while(minimumsize < fragsize) fragsize = fragsize / 2;
 
-            if(fragsize < ulPCMConsumeRate/256) 
+            if(fragsize < ulPCMConsumeRate/256)
             {//lower limit; don't accept extremely small buffers
                 fragsize = ulPCMConsumeRate/256;
             }
-    }   
+    }
     samplesize = (int)pConfigInfo->ulHwSampleSize;
 
@@ -280 +280 @@
 //Convert (if required) and write wave data to audio device
 //******************************************************************************
-BOOL WAVEPLAY::Transfer(OSSSTREAMID StreamId, PWAVECONFIGINFO pConfigInfo, 
-                        LINEAR pUserBuffer, ULONG ulBytesToTransfer, 
+BOOL WAVEPLAY::Transfer(OSSSTREAMID StreamId, PWAVECONFIGINFO pConfigInfo,
+                        LINEAR pUserBuffer, ULONG ulBytesToTransfer,
                         ULONG FAR *pulBytesTransferred)
 {
@@ -301 +301 @@
 //    if (!waveOpened) return TRUE;
 
-    if(pConfigInfo->usConversion == CONVERT_NONE) 
+    if(pConfigInfo->usConversion == CONVERT_NONE)
     {
 #ifdef DEBUG
         dprintf(("Transfer. NoConv ulB %ld",ulBytesToTransfer));
 #endif /* DEBUG */
-        if(AddBuffer(StreamId, pConfigInfo, pUserBuffer, ulBytesToTransfer, pulBytesTransferred) == FALSE) 
+        if(AddBuffer(StreamId, pConfigInfo, pUserBuffer, ulBytesToTransfer, pulBytesTransferred) == FALSE)
         {
             *pulBytesTransferred = 0;
@@ -320 +320 @@
             ulCvtBufferSize = min(CONVERSION_BUFFER_SIZE, ulCvtBufferSize);
 
-            //convert back from conversion to 'real' 
+            //convert back from conversion to 'real'
             ulBytesToTransfer = CONVERT_LENGTH(ulCvtBufferSize, CONVERSION_INVERT(pConfigInfo->ulConversionFactor));
 
@@ -331 +331 @@
             }
             pConfigInfo->pfnConvert(pUserBuffer, ulBytesToTransfer, pConfigInfo->pConversionBuffer);
-            if(AddBuffer(StreamId, pConfigInfo, pConfigInfo->pConversionBuffer, ulCvtBufferSize, pulBytesTransferred) == FALSE) 
+            if(AddBuffer(StreamId, pConfigInfo, pConfigInfo->pConversionBuffer, ulCvtBufferSize, pulBytesTransferred) == FALSE)
             {
                 *pulBytesTransferred = 0;
                 return FALSE;
             }
-            //convert back from conversion to 'real' 
+            //convert back from conversion to 'real'
             *pulBytesTransferred = CONVERT_LENGTH(*pulBytesTransferred, CONVERSION_INVERT(pConfigInfo->ulConversionFactor));
             if(*pulBytesTransferred & (pConfigInfo->ulSampleSize-1)) {
@@ -355 +355 @@
 // Perform sample rate conversion if required, else send buffer directly to ALSA
 //******************************************************************************
-BOOL WAVEPLAY::AddBuffer(OSSSTREAMID StreamId, PWAVECONFIGINFO pConfigInfo, LINEAR pUserBuffer, 
+BOOL WAVEPLAY::AddBuffer(OSSSTREAMID StreamId, PWAVECONFIGINFO pConfigInfo, LINEAR pUserBuffer,
                          ULONG ulBytesToTransfer, ULONG FAR *pulBytesTransferred)
 {
@@ -378 +378 @@
 
         //bytes to convert is bounded by bytes to transfer & max conversion buffer size
-        ulCvtBufferSize = SRATE_CONVERT_LENGTH(ulBytesToTransfer, pConfigInfo->ulSRatePosition, 
+        ulCvtBufferSize = SRATE_CONVERT_LENGTH(ulBytesToTransfer, pConfigInfo->ulSRatePosition,
                                                pConfigInfo->ulSRateIncrement);
         ulCvtBufferSize = min(CONVERSION_BUFFER_SIZE, ulCvtBufferSize);
         //round to sample boundary
         ulCvtBufferSize &= ~(pConfigInfo->ulHwSampleSize - 1);
-        
+
         if(ulCvtBufferSize == 0) {
             *pulBytesTransferred = ulBytesToTransfer;
-            if(pConfigInfo->ulSRatePosition >= pConfigInfo->ulSRateIncrement) { 
+            if(pConfigInfo->ulSRatePosition >= pConfigInfo->ulSRateIncrement) {
                 pConfigInfo->ulSRatePosition -= pConfigInfo->ulSRateIncrement;
             }
@@ -394 +394 @@
             return TRUE;
         }
-        pConfigInfo->pfnSRateConv(pUserBuffer, ulCvtBufferSize, pConfigInfo->pSRateConvBuffer, 
+        pConfigInfo->pfnSRateConv(pUserBuffer, ulCvtBufferSize, pConfigInfo->pSRateConvBuffer,
                                   pConfigInfo->ulSRatePosition, pConfigInfo->ulSRateIncrement);
 //PS++ !!!!! This don't be !!!!!!!
@@ -413 +413 @@
         }
         if((rc = OSS16_WaveAddBuffer(StreamId, pConfigInfo->pSRateConvBuffer, ulCvtBufferSize, pulBytesTransferred)) != OSSERR_SUCCESS ||
-           *pulBytesTransferred == 0) 
+           *pulBytesTransferred == 0)
         {
             if(rc == OSSERR_BUFFER_FULL) {
@@ -425 +425 @@
         ulHwSampleCount = *pulBytesTransferred/pConfigInfo->ulHwSampleSize;
 
-        //convert back from conversion to 'real' 
-        ulSampleCount   = SRATE_CONVERT_LENGTH_INVERT(ulHwSampleCount, 
-                                                      pConfigInfo->ulSRatePosition, 
+        //convert back from conversion to 'real'
+        ulSampleCount   = SRATE_CONVERT_LENGTH_INVERT(ulHwSampleCount,
+                                                      pConfigInfo->ulSRatePosition,
                                                       pConfigInfo->ulSRateIncrement);
 
@@ -447 +447 @@
         *pulBytesTransferred = ulSampleCount*pConfigInfo->ulHwSampleSize;
     }
-    else 
-    {
-       if( (rc=OSS16_WaveAddBuffer(StreamId, pUserBuffer, ulBytesToTransfer, pulBytesTransferred)) != OSSERR_SUCCESS) 
+    else
+    {
+       if( (rc=OSS16_WaveAddBuffer(StreamId, pUserBuffer, ulBytesToTransfer, pulBytesTransferred)) != OSSERR_SUCCESS)
        {
         *pulBytesTransferred = 0;
@@ -500 +500 @@
     //round to sample boundary
     *pulStreamSpace =cvt & ( ~(pConfigInfo->ulSampleSize - 1));
+    return TRUE;
+}
+//******************************************************************************
+//Get Bytes written to cyclic buffer (+ take conversion factor into account)
+//******************************************************************************
+BOOL WAVEPLAY::GetHwPtr(OSSSTREAMID StreamId, PWAVECONFIGINFO pConfigInfo, ULONG FAR *pulHwPtr)
+{
+    ULONG space,cvt;
+
+    if(OSS16_WaveGetHwPtr(StreamId, &space) != OSSERR_SUCCESS) {
+        *pulHwPtr = 0;
+        #ifdef DEBUG
+        dprintf(("OSS16_WAVEPLAY::WaveGetHwPtr: Failed"));
+        #endif /* DEBUG */
+        return FALSE;
+    }
+    cvt  = ConvertLengthInvert(space, pConfigInfo);
+    //round to sample boundary
+    *pulHwPtr = cvt & ( ~(pConfigInfo->ulSampleSize - 1));
     return TRUE;
 }