diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2010-04-06 03:48:07 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-04-06 03:48:07 (GMT) |
| commit | 281d95827bdce97727ed56049bd4afbac917ee91 (patch) | |
| tree | 59ecacb7f935494ee9df845637bc40e145c2143a | |
| parent | 5f377ecf7a473094908f9355b4c22fdcbd83c0d5 (diff) | |
| parent | bc190d195a20d5e87547e27265df2ce9668ab545 (diff) | |
| download | Qt-281d95827bdce97727ed56049bd4afbac917ee91.zip Qt-281d95827bdce97727ed56049bd4afbac917ee91.tar.gz Qt-281d95827bdce97727ed56049bd4afbac917ee91.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-multimedia
| -rw-r--r-- | src/multimedia/audio/qaudioinput_alsa_p.cpp | 1 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_alsa_p.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp index ead9995..6b15008 100644 --- a/src/multimedia/audio/qaudioinput_alsa_p.cpp +++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp @@ -428,7 +428,6 @@ bool QAudioInputPrivate::open() void QAudioInputPrivate::close() { - deviceState = QAudio::StoppedState; timer->stop(); if ( handle ) { diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp index 1cef335..cf3726b 100644 --- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp +++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp @@ -485,7 +485,6 @@ bool QAudioOutputPrivate::open() void QAudioOutputPrivate::close() { - deviceState = QAudio::StoppedState; timer->stop(); if ( handle ) { @@ -701,6 +700,7 @@ bool QAudioOutputPrivate::deviceReady() } else if(l < 0) { close(); + deviceState = QAudio::StoppedState; errorState = QAudio::IOError; emit stateChanged(deviceState); } |