diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-07 23:56:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-07 23:56:49 (GMT) |
| commit | 76b8cc4f12e8211bb5bb26f44613ac1d2ffcb5e7 (patch) | |
| tree | 15fd2e7d326ce013c962fe8e78686c80f01d52b5 | |
| parent | 32290f508b2d250cd7a3a783e8b7d2322e676783 (diff) | |
| parent | ac33de5bf257eb215a09c232d950be265d57d22f (diff) | |
| download | Qt-76b8cc4f12e8211bb5bb26f44613ac1d2ffcb5e7.zip Qt-76b8cc4f12e8211bb5bb26f44613ac1d2ffcb5e7.tar.gz Qt-76b8cc4f12e8211bb5bb26f44613ac1d2ffcb5e7.tar.bz2 | |
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:
[CRASH] audioinput and audiooutput examples crash when no devices are
| -rw-r--r-- | examples/multimedia/audioinput/audioinput.cpp | 3 | ||||
| -rw-r--r-- | examples/multimedia/audiooutput/audiooutput.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp index 8cc9948..fbf4dc4 100644 --- a/examples/multimedia/audioinput/audioinput.cpp +++ b/examples/multimedia/audioinput/audioinput.cpp @@ -213,6 +213,9 @@ InputTest::InputTest() if(format.sampleSize() != 16) { qWarning()<<"audio device doesn't support 16 bit samples, example cannot run"; + audioInput = 0; + button->setDisabled(true); + button2->setDisabled(true); return; } diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp index 0c57f4d..b44accd 100644 --- a/examples/multimedia/audiooutput/audiooutput.cpp +++ b/examples/multimedia/audiooutput/audiooutput.cpp @@ -179,6 +179,9 @@ AudioTest::AudioTest() if(settings.sampleSize() != 16) { qWarning()<<"audio device doesn't support 16 bit samples, example cannot run"; + button->setDisabled(true); + button2->setDisabled(true); + audioOutput = 0; return; } |