2 files changed, 13 insertions, 4 deletions
diff --git a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
index eb4caf128..104055f30 100644
--- a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
@@ -291,11 +291,22 @@ bool QWindowsAudioOutput::open()
     return true;
 }
 
+void QWindowsAudioOutput::pauseAndSleep()
+{
+    waveOutPause(hWaveOut);
+    int bitrate = settings.sampleRate() * settings.channelCount() * settings.sampleSize() / 8;
+    // Time of written data.
+    int delay = (buffer_size - bytesFree()) * 1000 / bitrate;
+    Sleep(delay + 10);
+}
+
 void QWindowsAudioOutput::close()
 {
     if(deviceState == QAudio::StoppedState)
         return;
 
+    // Pause playback before reset to avoid uneeded crackling at the end.
+    pauseAndSleep();
     deviceState = QAudio::StoppedState;
     errorState = QAudio::NoError;
     waveOutReset(hWaveOut);
@@ -451,10 +462,7 @@ void QWindowsAudioOutput::resume()
 void QWindowsAudioOutput::suspend()
 {
     if(deviceState == QAudio::ActiveState || deviceState == QAudio::IdleState) {
-        int delay = (buffer_size-bytesFree())*1000/(settings.sampleRate()
-                *settings.channelCount()*(settings.sampleSize()/8));
-        waveOutPause(hWaveOut);
-        Sleep(delay+10);
+        pauseAndSleep();
         deviceState = QAudio::SuspendedState;
         errorState = QAudio::NoError;
         emit stateChanged(deviceState);
diff --git a/src/plugins/windowsaudio/qwindowsaudiooutput.h b/src/plugins/windowsaudio/qwindowsaudiooutput.h
index f25475b02..b71f00e98 100644
--- a/src/plugins/windowsaudio/qwindowsaudiooutput.h
+++ b/src/plugins/windowsaudio/qwindowsaudiooutput.h
@@ -115,6 +115,7 @@ private slots:
     bool deviceReady();
 
 private:
+    void pauseAndSleep();
     QByteArray m_device;
     int bytesAvailable;
     QTime timeStamp;