summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2016-01-19 14:12:19 +0100
committerYoann Lopes <yoann.lopes@theqtcompany.com>2016-01-19 15:30:48 +0000
commit4fd2b2f6849cda72cdcc06aa0907bc565875f6dd (patch)
tree9e4d0f06b3937c1070570d70eb7d8bdee12f35b6
parent627e488d548878ddfcddc2689c74dbf0fa52518b (diff)
Alsa: fix QAudioOutput state after resume().
In push mode, the state must be IdleState after resume(), and only change to ActiveState once it receives some data. Task-number: QTBUG-50390 Change-Id: Idd08d8826f00d943b3bf750524f811874e010149 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com>
-rw-r--r--src/plugins/alsa/qalsaaudiooutput.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/alsa/qalsaaudiooutput.cpp b/src/plugins/alsa/qalsaaudiooutput.cpp
index f8f0f58e8..a382b666a 100644
--- a/src/plugins/alsa/qalsaaudiooutput.cpp
+++ b/src/plugins/alsa/qalsaaudiooutput.cpp
@@ -651,7 +651,7 @@ void QAlsaAudioOutput::resume()
}
resuming = true;
- deviceState = QAudio::ActiveState;
+ deviceState = pullMode ? QAudio::ActiveState : QAudio::IdleState;
errorState = QAudio::NoError;
timer->start(period_time/1000);