diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-03-11 23:33:41 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-03-11 23:33:41 (GMT) |
| commit | 3a1c77a8d92610f11b95ead77b1d2c68f0883739 (patch) | |
| tree | 659c500c6da020eede2d8b92f86ef22c5e63d24b /src/multimedia | |
| parent | b7ef079177ceec96f821393796c6c5b14c21704e (diff) | |
| parent | 655a79094749f13f4b72d94a7b768ac89d21c7f4 (diff) | |
| download | Qt-3a1c77a8d92610f11b95ead77b1d2c68f0883739.zip Qt-3a1c77a8d92610f11b95ead77b1d2c68f0883739.tar.gz Qt-3a1c77a8d92610f11b95ead77b1d2c68f0883739.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
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) { |