summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2010-04-06 02:35:01 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2010-04-06 02:35:01 (GMT)
commit1f6d3c9cddaf1e44ae9f0a18e9df5d4affe3f8b2 (patch)
tree2ffb320e808930f8539a9c383d25b4d190e0997d /src/multimedia/audio
parentb687323d13aca4f3684413231a996b30d19cab25 (diff)
downloadQt-1f6d3c9cddaf1e44ae9f0a18e9df5d4affe3f8b2.zip
Qt-1f6d3c9cddaf1e44ae9f0a18e9df5d4affe3f8b2.tar.gz
Qt-1f6d3c9cddaf1e44ae9f0a18e9df5d4affe3f8b2.tar.bz2
QAudioInput: possible change of state without emitting stateChange()
Removed state change from close() function, should be set by caller depending on context. Task-number:QTBUG-9357 Reviewed-by:Dmytro Poplavskiy
Diffstat (limited to 'src/multimedia/audio')
-rw-r--r--src/multimedia/audio/qaudioinput_alsa_p.cpp1
-rw-r--r--src/multimedia/audio/qaudiooutput_alsa_p.cpp2
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);
}