summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2010-06-25 02:40:38 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2010-06-25 02:40:38 (GMT)
commit0ad9edf26daf78d697cd9e83c639c65879461b0f (patch)
treeae884b180c7261ed972d89f758d285551d0d705e /src
parentd9568e5e8a7350dd0d186d9ab0404c125e79d085 (diff)
downloadQt-0ad9edf26daf78d697cd9e83c639c65879461b0f.zip
Qt-0ad9edf26daf78d697cd9e83c639c65879461b0f.tar.gz
Qt-0ad9edf26daf78d697cd9e83c639c65879461b0f.tar.bz2
Fix compile error on win32 with multimedia lib.
Reviewed-by:TrustMe
Diffstat (limited to 'src')
-rw-r--r--src/multimedia/audio/qaudiooutput_win32_p.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp
index f26198f..075d100 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp
@@ -99,9 +99,6 @@
#define WAVE_FORMAT_EXTENSIBLE 0xFFFE
#endif
-DEFINE_GUID(_KSDATAFORMAT_SUBTYPE_PCM,
-0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
-
//#define DEBUG_AUDIO 1
QT_BEGIN_NAMESPACE
@@ -328,6 +325,8 @@ bool QAudioOutputPrivate::open()
wfex.Format.nBlockAlign = wfex.Format.nChannels*wfex.Format.wBitsPerSample/8;
wfex.Format.nAvgBytesPerSec=wfex.Format.nSamplesPerSec*wfex.Format.nBlockAlign;
wfex.Samples.wValidBitsPerSample=wfex.Format.wBitsPerSample;
+ static const GUID _KSDATAFORMAT_SUBTYPE_PCM = {
+ 0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
wfex.SubFormat=_KSDATAFORMAT_SUBTYPE_PCM;
wfex.Format.cbSize=22;