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

Timestamp:

Feb 14, 2008, 6:18:58 AM (18 years ago)

Author:

Brendan Oakley

Message:

Clean up excessive Uni16 debug output and enable sending output to uniaud32 on Release builds - from Allan

File:

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

OCO/trunk/drv16/waveplay.cpp

@@ -1 @@
-/* $Id: waveplay.cpp,v 1.1.1.1 2003/07/02 13:57:08 eleph Exp $ */
 
 /* SCCSID = %W% %E% */
@@ -169 +168 @@
     int rc;
 
-#ifdef DEBUG
-    dprintf(("WAVEPLAY::ConfigDev"));
-#endif
 
     if (fAPMSuspend)
@@ -194 +190 @@
     }
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::ConfigDev1 SampleRate %d", pConfigInfo->ulHwSampleRate));
-    dprintf(("WAVEPLAY::ConfigDev1 ulFirstBufSize %d", ulFirstBufSize));
-    dprintf(("WAVEPLAY::ConfigDev1 ulFragsize %d", pConfigInfo->ulFragsize));
+    dprintf(("WAVEPLAY::ConfigDev1 SampleRate %ld", pConfigInfo->ulHwSampleRate));
+    dprintf(("WAVEPLAY::ConfigDev1 ulFirstBufSize %ld", ulFirstBufSize));
+    dprintf(("WAVEPLAY::ConfigDev1 ulFragsize %ld", pConfigInfo->ulFragsize));
 #endif
 
@@ -213 +209 @@
         ulFirstBufSize = ConvertLength(ulFirstBufSize, pConfigInfo);
 #ifdef DEBUG
-        dprintf(("WAVEPLAY::ConfigDev2 ulFirstBufSize %d", ulFirstBufSize));
+        dprintf(("WAVEPLAY::ConfigDev2 ulFirstBufSize %ld", ulFirstBufSize));
 #endif /* DEBUG */
     }
@@ -219 +215 @@
     //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);
 #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));
+    dprintf(("WAVEPLAY::ConfigDev: cons rate %ld buf size %ld init rate %ld", ulPCMConsumeRate, ulFirstBufSize, pConfigInfo->ulHwSampleRate));
 #endif /* DEBUG */
 
@@ -265 +251 @@
 
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::ConfigDev: SampleRate %d", pConfigInfo->ulHwSampleRate));
-    dprintf(("WAVEPLAY::ConfigDev2 fragsize %d", fragsize));
+    dprintf(("WAVEPLAY::ConfigDev2 fragsize %ld", fragsize));
 #endif
     hwparam.ulSampleRate    = pConfigInfo->ulHwSampleRate;
@@ -275 +260 @@
 #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));
-        dprintf(("WAVEPLAY:ConfigDev:channels %d",hwparam.ulNumChannels));
-        dprintf(("WAVEPLAY:ConfigDev:data type %d",hwparam.ulDataType));
+        dprintf(("WAVEPLAY:ConfigDev:samp rate %ld",hwparam.ulSampleRate));
+        dprintf(("WAVEPLAY:ConfigDev:bits per sample %ld",hwparam.ulBitsPerSample));
+        dprintf(("WAVEPLAY:ConfigDev:channels %ld",hwparam.ulNumChannels));
+        dprintf(("WAVEPLAY:ConfigDev:data type %ld",hwparam.ulDataType));
 
 #endif
@@ -319 +304 @@
     {
 #ifdef DEBUG
-        dprintf(("Transfer. NoConv ulB %d",ulBytesToTransfer));
+        dprintf(("Transfer. NoConv ulB %ld",ulBytesToTransfer));
 #endif /* DEBUG */
         if(AddBuffer(StreamId, pConfigInfo, pUserBuffer, ulBytesToTransfer, pulBytesTransferred) == FALSE) 
@@ -342 +327 @@
                 ulBytesToTransfer = ulBytesToTransfer & ~(pConfigInfo->ulSampleSize-1);
 #ifdef DEBUG
-                dprintf(("New ulBr %d" , ulBytesToTransfer));
+                dprintf(("New ulBr %ld" , ulBytesToTransfer));
 #endif
             }
@@ -356 +341 @@
                 DebugInt3();
 #ifdef DEBUG
-                dprintf(("New pulBr %d" , pulBytesTransferred));
+                dprintf(("New pulBr %ld" , pulBytesTransferred));
 #endif
             }