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:
  QAudioInput loses data on Maemo5/other linux platforms.
  Fix warning in qfilesystemmodel_p.h
  Frequency to SampleRate and channels to channelCount.
  Added setChannelCount() to QAudioFormat.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp
index f50a547..f98ecc6 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.cpp
+++ b/src/multimedia/audio/qaudioinput_win32_p.cpp
@@ -225,16 +225,16 @@ 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;
     }
     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;
@@ -374,8 +374,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;
@@ -388,8 +388,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;