Added new funcs to QAudioFormat and QAudioDeviceInfo class's.

QAudioFormat::setChannelCount(), channelCount()
QAudioFormat::setSampleRate(), sampleRate()
QAudioDeviceInfo::supportedChannelCounts(), supportedSampleRates()
Changed all instances to use these new functions instead of
channels(),frequency(),setFrequency(),setChannels()
supportedChannels(),supportedFrequencies()
Old functions still exist but are marked obsolete.

Reviewed-by:Justin McPherson

1 files changed, 8 insertions, 8 deletions

diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp
index a059e76..ca0bc24 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.cpp
+++ b/src/multimedia/audio/qaudioinput_win32_p.cpp
@@ -217,21 +217,21 @@ bool QAudioInputPrivate::open()
     header = 0;
     if(buffer_size == 0) {
         // Default buffer size, 100ms, default period size is 20ms
-        buffer_size = settings.frequency()*settings.channels()*(settings.sampleSize()/8)*0.1;
+        buffer_size = settings.sampleRate()*settings.channelCount()*(settings.sampleSize()/8)*0.1;
 	period_size = buffer_size/5;
     } else {
         period_size = buffer_size/5;
     }
 #ifdef Q_OS_WINCE
     // For wince reduce size to 40ms for buffer size and 20ms period
-    buffer_size = settings.frequency()*settings.channels()*(settings.sampleSize()/8)*0.04;
+    buffer_size = settings.sampleRate()*settings.channelCount()*(settings.sampleSize()/8)*0.04;
     period_size = buffer_size/2;
 #endif
     timeStamp.restart();
     elapsedTimeOffset = 0;
-    wfx.nSamplesPerSec = settings.frequency();
+    wfx.nSamplesPerSec = settings.sampleRate();
     wfx.wBitsPerSample = settings.sampleSize();
-    wfx.nChannels = settings.channels();
+    wfx.nChannels = settings.channelCount();
     wfx.cbSize = 0;
 
     wfx.wFormatTag = WAVE_FORMAT_PCM;
@@ -367,8 +367,8 @@ qint64 QAudioInputPrivate::read(char* data, qint64 len)
 
                 } else {
                     totalTimeValue += waveBlocks[header].dwBytesRecorded
-                        /((settings.channels()*settings.sampleSize()/8))
-                        *10000/settings.frequency()*100;
+                        /((settings.channelCount()*settings.sampleSize()/8))
+                        *10000/settings.sampleRate()*100;
                     errorState = QAudio::NoError;
                     deviceState = QAudio::ActiveState;
 		    resuming = false;
@@ -381,8 +381,8 @@ qint64 QAudioInputPrivate::read(char* data, qint64 len)
                 qDebug()<<"IN: "<<waveBlocks[header].dwBytesRecorded<<", OUT: "<<l;
 #endif
                 totalTimeValue += waveBlocks[header].dwBytesRecorded
-                    /((settings.channels()*settings.sampleSize()/8))
-                    *10000/settings.frequency()*100;
+                    /((settings.channelCount()*settings.sampleSize()/8))
+                    *10000/settings.sampleRate()*100;
                 errorState = QAudio::NoError;
                 deviceState = QAudio::ActiveState;
 		resuming = false;