summaryrefslogtreecommitdiffstats
path: root/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2016-01-19 13:35:33 +0100
committerYoann Lopes <yoann.lopes@theqtcompany.com>2016-01-19 15:30:36 +0000
commitf97c4aaa86a8a0a5694e0e534892e7a3aa76d2ca (patch)
tree68c852e5a7b0a5c4c74896613c4603b9e6351d85 /src/plugins/windowsaudio/qwindowsaudiooutput.cpp
parentb4d03dc82f6d282582dda2137fadd54f97d3b9a7 (diff)
WindowsAudio: 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: I0e12f4eaff350b9423e44779f229e0e1061cf576 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com>
Diffstat (limited to 'src/plugins/windowsaudio/qwindowsaudiooutput.cpp')
-rw-r--r--src/plugins/windowsaudio/qwindowsaudiooutput.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
index 7e2205dea..22746a63a 100644
--- a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
@@ -434,7 +434,7 @@ qint64 QWindowsAudioOutput::write( const char *data, qint64 len )
void QWindowsAudioOutput::resume()
{
if(deviceState == QAudio::SuspendedState) {
- deviceState = QAudio::ActiveState;
+ deviceState = pullMode ? QAudio::ActiveState : QAudio::IdleState;
errorState = QAudio::NoError;
waveOutRestart(hWaveOut);
QTimer::singleShot(10, this, SLOT(feedback()));