diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:26:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:26:14 +0200 |
| commit | 1925bb404ec47b6e074c5e3b334fe0be12176d7b (patch) | |
| tree | 8d7d79ac1b3a549c20bb4fa77c6f457bf1bb61ea /src/plugins/windowsaudio/qwindowsaudioinput.h | |
| parent | 6187b72c51d0c05955d9d814baf8866b8e70fcfe (diff) | |
| parent | f9145aca166ad2ca1514524ce88ded7834eb207c (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
src/multimedia/playback/playlistfileparser.cpp
src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19
Diffstat (limited to 'src/plugins/windowsaudio/qwindowsaudioinput.h')
| -rw-r--r-- | src/plugins/windowsaudio/qwindowsaudioinput.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/windowsaudio/qwindowsaudioinput.h b/src/plugins/windowsaudio/qwindowsaudioinput.h index 30388c7fd..a93fd9cb0 100644 --- a/src/plugins/windowsaudio/qwindowsaudioinput.h +++ b/src/plugins/windowsaudio/qwindowsaudioinput.h @@ -45,8 +45,7 @@ #ifndef QWINDOWSAUDIOINPUT_H #define QWINDOWSAUDIOINPUT_H -#include <QtCore/qt_windows.h> -#include <mmsystem.h> +#include "qwindowsaudioutils.h" #include <QtCore/qfile.h> #include <QtCore/qdebug.h> @@ -121,7 +120,7 @@ private: qint64 totalTimeValue; bool pullMode; bool resuming; - WAVEFORMATEX wfx; + WAVEFORMATEXTENSIBLE wfx; HWAVEIN hWaveIn; MMRESULT result; WAVEHDR* waveBlocks; |