summaryrefslogtreecommitdiffstats
path: root/src/plugins/windowsaudio
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-11-20 13:17:23 +0100
committerLiang Qi <liang.qi@qt.io>2017-11-20 13:17:23 +0100
commit45cbaf2a8158f5972e3362f7e777d3263d7c7916 (patch)
tree329c9ccd8d6bb9c2e11d98ed9149c714c04ca987 /src/plugins/windowsaudio
parentcf43124fcbea64f15f0800f090fdf885e08019c7 (diff)
parent5af70385a0b1a04e10d088f655ee33338ec014c5 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Diffstat (limited to 'src/plugins/windowsaudio')
-rw-r--r--src/plugins/windowsaudio/qwindowsaudiooutput.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/windowsaudio/qwindowsaudiooutput.h b/src/plugins/windowsaudio/qwindowsaudiooutput.h
index 19b4b92af..f25475b02 100644
--- a/src/plugins/windowsaudio/qwindowsaudiooutput.h
+++ b/src/plugins/windowsaudio/qwindowsaudiooutput.h
@@ -116,7 +116,6 @@ private slots:
private:
QByteArray m_device;
- bool resuming;
int bytesAvailable;
QTime timeStamp;
qint64 elapsedTimeOffset;
@@ -139,8 +138,6 @@ private:
WAVEFORMATEXTENSIBLE wfx;
HWAVEOUT hWaveOut;
- MMRESULT result;
- WAVEHDR header;
WAVEHDR* waveBlocks;
volatile bool finished;
volatile int waveFreeBlockCount;