diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 02:38:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 02:38:50 (GMT) |
| commit | 2aa973db1d74044cad42f792ea0b682366391cd5 (patch) | |
| tree | a8bfc060be78670818546528c5f4d8a52b542976 /examples | |
| parent | a433a46e4aa726185272d66069e6d9b7c8ab9cf8 (diff) | |
| parent | b580c13afb26592b755956d809b02fd8fd5e99cd (diff) | |
| download | Qt-2aa973db1d74044cad42f792ea0b682366391cd5.zip Qt-2aa973db1d74044cad42f792ea0b682366391cd5.tar.gz Qt-2aa973db1d74044cad42f792ea0b682366391cd5.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:
Fix namespace issues.
Fix Audio input on OSX 10.6.
Fix warnings in AudioInput example.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/multimedia/audioinput/audioinput.cpp | 2 | ||||
| -rw-r--r-- | examples/multimedia/audioinput/audioinput.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp index b01a396..7c2cc30 100644 --- a/examples/multimedia/audioinput/audioinput.cpp +++ b/examples/multimedia/audioinput/audioinput.cpp @@ -76,6 +76,7 @@ AudioInfo::AudioInfo(const QAudioFormat &format, QObject *parent) case QAudioFormat::SignedInt: m_maxAmplitude = 127; break; + default: ; } break; case 16: @@ -86,6 +87,7 @@ AudioInfo::AudioInfo(const QAudioFormat &format, QObject *parent) case QAudioFormat::SignedInt: m_maxAmplitude = 32767; break; + default: ; } break; } diff --git a/examples/multimedia/audioinput/audioinput.h b/examples/multimedia/audioinput/audioinput.h index f87c682..be721de 100644 --- a/examples/multimedia/audioinput/audioinput.h +++ b/examples/multimedia/audioinput/audioinput.h @@ -119,8 +119,8 @@ private: QPushButton *m_suspendResumeButton; QComboBox *m_deviceBox; - AudioInfo *m_audioInfo; QAudioDeviceInfo m_device; + AudioInfo *m_audioInfo; QAudioFormat m_format; QAudioInput *m_audioInput; QIODevice *m_input; |