Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
  Revert "Frequency to SampleRate and channels to channelCount." missed
  Revert "Frequency to SampleRate and channels to channelCount."
  Revert "Added setChannelCount() to QAudioFormat."

1 files changed, 13 insertions, 13 deletions

diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
index a77a428..36270a7 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
@@ -78,20 +78,20 @@ QAudioFormat QAudioDeviceInfoInternal::preferredFormat() const
 {
     QAudioFormat nearest;
     if(mode == QAudio::AudioOutput) {
-        nearest.setSampleRate(44100);
-        nearest.setChannelCount(2);
+        nearest.setFrequency(44100);
+        nearest.setChannels(2);
         nearest.setByteOrder(QAudioFormat::LittleEndian);
         nearest.setSampleType(QAudioFormat::SignedInt);
         nearest.setSampleSize(16);
         nearest.setCodec(QLatin1String("audio/pcm"));
     } else {
-        nearest.setSampleRate(8000);
-        nearest.setChannelCount(1);
+        nearest.setFrequency(8000);
+        nearest.setChannels(1);
         nearest.setSampleType(QAudioFormat::UnSignedInt);
         nearest.setSampleSize(8);
         nearest.setCodec(QLatin1String("audio/pcm"));
         if(!testSettings(nearest)) {
-            nearest.setChannelCount(2);
+            nearest.setChannels(2);
             nearest.setSampleSize(16);
             nearest.setSampleType(QAudioFormat::SignedInt);
         }
@@ -253,8 +253,8 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const
     snd_pcm_hw_params_any( handle, params );
 
     // set the values!
-    snd_pcm_hw_params_set_channels(handle,params,format.channelCount());
-    snd_pcm_hw_params_set_rate(handle,params,format.sampleRate(),dir);
+    snd_pcm_hw_params_set_channels(handle,params,format.channels());
+    snd_pcm_hw_params_set_rate(handle,params,format.frequency(),dir);
     switch(format.sampleSize()) {
         case 8:
             if(format.sampleType() == QAudioFormat::SignedInt)
@@ -295,18 +295,18 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const
     } else
         testCodec = true;
 
-    if(err>=0 && format.channelCount() != -1) {
-        err = snd_pcm_hw_params_test_channels(handle,params,format.channelCount());
+    if(err>=0 && format.channels() != -1) {
+        err = snd_pcm_hw_params_test_channels(handle,params,format.channels());
         if(err>=0)
-            err = snd_pcm_hw_params_set_channels(handle,params,format.channelCount());
+            err = snd_pcm_hw_params_set_channels(handle,params,format.channels());
         if(err>=0)
             testChannel = true;
     }
 
-    if(err>=0 && format.sampleRate() != -1) {
-        err = snd_pcm_hw_params_test_rate(handle,params,format.sampleRate(),0);
+    if(err>=0 && format.frequency() != -1) {
+        err = snd_pcm_hw_params_test_rate(handle,params,format.frequency(),0);
         if(err>=0)
-            err = snd_pcm_hw_params_set_rate(handle,params,format.sampleRate(),dir);
+            err = snd_pcm_hw_params_set_rate(handle,params,format.frequency(),dir);
         if(err>=0)
             testFreq = true;
     }