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

Timestamp:

Nov 4, 2007, 8:19:50 PM (18 years ago)

Author:

Brendan Oakley

Message:

Send Uniaud16 debug output to Uniaud32 instead of com port, from Pavel

File:

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

OCO/trunk/drv16/waveplay.cpp

@@ -140 +140 @@
                 StreamId = 0UL;
                 open_strategy = 0UL;
+#ifdef DEBUG
+                dprintf(("OSS16_WAVECLOSE: Success\n"));
+#endif /* DEBUG */
                 return TRUE;
             } else
+#ifdef DEBUG
+                dprintf(("OSS16_WAVECLOSE: Error\n"));
+#endif /* DEBUG */
                 return FALSE;
         }
@@ -188 +194 @@
 #ifdef DEBUG
     dprintf(("WAVEPLAY::ConfigDev1 SampleRate %d", pConfigInfo->ulHwSampleRate));
+    dprintf(("WAVEPLAY::ConfigDev1 ulFirstBufSize %d", ulFirstBufSize));
+    dprintf(("WAVEPLAY::ConfigDev1 ulFragsize %d", pConfigInfo->ulFragsize));
 #endif
 
@@ -195 +203 @@
             DebugInt3();
             ulFirstBufSize = 8192; //should never happen!
+#ifdef DEBUG
+            dprintf(("Arg - shouldn't happen"));
+#endif /* DEBUG */
         }
     }
@@ -200 +211 @@
         //convert size of first buffer
         ulFirstBufSize = ConvertLength(ulFirstBufSize, pConfigInfo);
+#ifdef DEBUG
+        dprintf(("WAVEPLAY::ConfigDev2 ulFirstBufSize %d", ulFirstBufSize));
+#endif /* DEBUG */
     }
 
     //Must call this method (i.e. resets sample rate conversion position)
     WAVEAUDIO::ConfigDev(StreamId, pConfigInfo, ulFirstBufSize);
+#ifdef DEBUG
+    dprintf(("WAVEPLAY::ConfigDev3 ulFirstBufSize %d", ulFirstBufSize));
+#endif /* DEBUG */
 
     //get real sample format used to program the audio hardware (taking conversion into account)
     QuerySampleFormat(OPERATION_PLAY, pConfigInfo);
+#ifdef DEBUG
+    dprintf(("WAVEPLAY::ConfigDev4 ulFirstBufSize %d", ulFirstBufSize));
+#endif /* DEBUG */
 
     //convert consume rate
     ulPCMConsumeRate = ConvertLength(pConfigInfo->ulPCMConsumeRate, pConfigInfo);
-
-    dprintf(("WAVEPLAY::ConfigDev: cons rate %d, buf size %d init rate %d", ulPCMConsumeRate, ulFirstBufSize, pConfigInfo->ulHwSampleRate));
+#ifdef DEBUG
+    dprintf(("WAVEPLAY::ConfigDev5 ulFirstBufSize %d", ulFirstBufSize));
+    dprintf(("WAVEPLAY::ConfigDev5 ulPCMConsumeRate %d", ulPCMConsumeRate));
+
+    dprintf(("WAVEPLAY::ConfigDev: cons rate %d buf size %d init rate %d", ulPCMConsumeRate, ulFirstBufSize, pConfigInfo->ulHwSampleRate));
+    dprintf(("WAVEPLAY::ConfigDev6 ulFirstBufSize %d", ulFirstBufSize));
+#endif /* DEBUG */
 
     fragsize = ulPCMConsumeRate/64; //start with 64 irqs/sec
@@ -240 +265 @@
 #ifdef DEBUG
     dprintf(("WAVEPLAY::ConfigDev: SampleRate %d", pConfigInfo->ulHwSampleRate));
+    dprintf(("WAVEPLAY::ConfigDev2 fragsize %d", fragsize));
 #endif
     hwparam.ulSampleRate    = pConfigInfo->ulHwSampleRate;
@@ -245 +271 @@
     hwparam.ulNumChannels   = pConfigInfo->ulHwNumChannels;
     hwparam.ulDataType      = QueryOSSDataFormat(OPERATION_PLAY, pConfigInfo->ulDataType, pConfigInfo->ulHwBitsPerSample);
-    if((rc = (int)OSS16_WaveSetFormat(StreamId, &hwparam)) != OSSERR_SUCCESS) {
-#ifdef DEBUG
-        dprintf(("WAVEPLAY:ConfigDev:OSS16_WaveSetFormat error. rc = %d",rc));
+    rc = (int)OSS16_WaveSetFormat(StreamId, &hwparam);
+#ifdef DEBUG
+        dprintf(("WAVEPLAY:ConfigDev:OSS16_WaveSetFormat . rc = %d",rc));
         dprintf(("WAVEPLAY:ConfigDev:samp rate %d",hwparam.ulSampleRate));
         dprintf(("WAVEPLAY:ConfigDev:bits per sample %d",hwparam.ulBitsPerSample));
@@ -254 +280 @@
 
 #endif
+    if( rc != OSSERR_SUCCESS) {
 //        DevHelp_Beep(500, 100);
         DebugInt3();
@@ -290 +317 @@
     if(pConfigInfo->usConversion == CONVERT_NONE) 
     {
+#ifdef DEBUG
+        dprintf(("Transfer. NoConv ulB %d",ulBytesToTransfer));
+#endif /* DEBUG */
         if(AddBuffer(StreamId, pConfigInfo, pUserBuffer, ulBytesToTransfer, pulBytesTransferred) == FALSE) 
         {
@@ -365 +395 @@
                 pConfigInfo->ulSRatePosition -= pConfigInfo->ulSRateIncrement;
             }
-            dprintf2(("WAVEPLAY::AddBuffer %lx %lx %lx -> nothing left", ulBytesToTransfer, pConfigInfo->ulSRatePosition, pConfigInfo->ulSRateIncrement));
+#ifdef DEBUG
+            dprintf(("WAVEPLAY::AddBuffer %lx %lx %lx -> nothing left", ulBytesToTransfer, pConfigInfo->ulSRatePosition, pConfigInfo->ulSRateIncrement));
+#endif /* DEBUG */
             return TRUE;
         }
@@ -377 +409 @@
                  dprintf2(("WAVEPLAY::AddBuffer; OSS16_WaveAddBuffer %lx %x failed due to full buffer", ulCvtBufferSize, (USHORT)rc));
             }
-//            else dprintf(("WAVEPLAY::AddBuffer; OSS16_WaveAddBuffer %lx %x failed", ulCvtBufferSize, (USHORT)rc));
+#ifdef DEBUG
+            else dprintf(("WAVEPLAY::AddBuffer; OSS16_WaveAddBuffer %lx %x failed", ulCvtBufferSize, (USHORT)rc));
+#endif /* DEBUG */
             *pulBytesTransferred = 0;
             return FALSE;
@@ -423 +457 @@
     if(OSS16_WaveGetPos(StreamId, &ulCurBytesProcessed) != OSSERR_SUCCESS) {
         *pulStreamPosition = 0;
+#ifdef DEBUG
+        dprintf(("OSS16_WAVEPLAY::GetPosition: Failed"));
+#endif /* DEBUG */
         return FALSE;
     }
@@ -442 +479 @@
     if(OSS16_WaveGetSpace(StreamId, &space) != OSSERR_SUCCESS) {
         *pulStreamSpace = 0;
+#ifdef DEBUG
+        dprintf(("OSS16_WAVEPLAY::GetSpace: Failed"));
+#endif /* DEBUG */
         return FALSE;
     }