Changeset 221 for OCO/trunk/drv16/waudio.cpp

Timestamp:

Jul 17, 2007, 6:04:31 PM (18 years ago)

Author:

Brendan Oakley

Message:

Applied latest updates from Vlad

File:

• OCO/trunk/drv16/waudio.cpp (modified) (2 diffs)

OCO/trunk/drv16/waudio.cpp

@@ -434 +434 @@
     //manual sample rate conversion before sending buffers to the ALSA driver
     FindMatchingSampleRate(pConfigInfo->ulSampleRate, pWaveCaps->ulRateFlags, &ulNrSampleRates, &pConfigInfo->ulFixedSampleRate);
-    if(ulNrSampleRates == 1 && pConfigInfo->ulSampleRate != pConfigInfo->ulFixedSampleRate) {
+    if(ulNrSampleRates <= 2 && pConfigInfo->ulSampleRate != pConfigInfo->ulFixedSampleRate) {
         pConfigInfo->fSampleRateConversion = TRUE;
     }
@@ -1015 +1015 @@
         sampleRates[nrSampleRates++] = 192000;
     }
-    if(nrSampleRates > 1) {
+    if(nrSampleRates > 2) {
         _usfind_matching_sample_rate(&ulSampleRate, nrSampleRates, (ULONG FAR *)sampleRates);
     }
     else {
         //fixed rate -> we support all sample rates by manually performing sample rate conversion
-        if(nrSampleRates == 1 && pulFixedSampleRate) {
-            *pulFixedSampleRate = sampleRates[0];
+        if(nrSampleRates <= 2 && pulFixedSampleRate) {
+            sampleRates[0] = 48000; /* hardware set to 48000 */
+            *pulFixedSampleRate = sampleRates[0]; 
+            nrSampleRates = 1;
         }
     }