diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 15:32:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 15:32:28 (GMT) |
| commit | 655a79094749f13f4b72d94a7b768ac89d21c7f4 (patch) | |
| tree | e82895c8d48dc4cdf0b1446d9983405b9c9cbb84 /src/multimedia | |
| parent | 68d55f6e04f77ad590231fde4ef0f5fe7fa8ca82 (diff) | |
| parent | b375d1c9f0aa9441827b4340dca5edc2ff6cb43d (diff) | |
| download | Qt-655a79094749f13f4b72d94a7b768ac89d21c7f4.zip Qt-655a79094749f13f4b72d94a7b768ac89d21c7f4.tar.gz Qt-655a79094749f13f4b72d94a7b768ac89d21c7f4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Ensure audio converter member is initialized.
Documentation fix.
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/audio/qaudioinput.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudioinput_mac_p.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp index fd892dd..10bab01 100644 --- a/src/multimedia/audio/qaudioinput.cpp +++ b/src/multimedia/audio/qaudioinput.cpp @@ -95,7 +95,7 @@ QT_BEGIN_NAMESPACE format.setByteOrder(QAudioFormat::LittleEndian); format.setSampleType(QAudioFormat::UnSignedInt); - if (QAudioDeviceInfo info(QAudioDeviceInfo::defaultInputDevice()); + QAudioDeviceInfo info = QAudioDeviceInfo::defaultInputDevice(); if (!info.isFormatSupported(format)) { qWarning()<<"default format not supported try to use nearest"; format = info.nearestFormat(format); diff --git a/src/multimedia/audio/qaudioinput_mac_p.cpp b/src/multimedia/audio/qaudioinput_mac_p.cpp index bd2de52..f394ca4 100644 --- a/src/multimedia/audio/qaudioinput_mac_p.cpp +++ b/src/multimedia/audio/qaudioinput_mac_p.cpp @@ -229,6 +229,7 @@ public: QObject* parent): QObject(parent), m_deviceError(false), + m_audioConverter(0), m_inputFormat(inputFormat), m_outputFormat(outputFormat) { |