diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-16 16:49:52 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-17 13:40:13 +0200 |
| commit | 40fe658dce86f29197b6b57a13667a7561e58f35 (patch) | |
| tree | 8932a81680c56ee94dd07fcbecfa8d019f39d241 /src/multimedia/audio | |
| parent | a410276d0d0888380a09d50fd80cf85429f04f6b (diff) | |
Fix compilation with stock MinGW.
Use qt_windows.h, provide interfaces and UIDs missing
in stock MinGW.
Task-number: QTBUG-23829
Change-Id: I79ed902bb7636c751df7607f6059a7de237acb31
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/multimedia/audio')
| -rw-r--r-- | src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp | 27 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudioinput_win32_p.h | 4 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_win32_p.h | 4 |
3 files changed, 27 insertions, 8 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp index e72d6fda2..bfbd04268 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp @@ -51,14 +51,37 @@ // -#include <windows.h> +#include <QtCore/qt_windows.h> #include <mmsystem.h> #include "qaudiodeviceinfo_win32_p.h" -#include <dshow.h> #if defined(Q_CC_MINGW) && !defined(__MINGW64_VERSION_MAJOR) +struct IBaseFilter; // Needed for strmif.h from stock MinGW. +struct _DDPIXELFORMAT; +typedef struct _DDPIXELFORMAT* LPDDPIXELFORMAT; +#endif + +#include <strmif.h> +#if !defined(Q_CC_MINGW) || defined(__MINGW64_VERSION_MAJOR) +# include <uuids.h> +#else extern GUID CLSID_AudioInputDeviceCategory; +extern GUID CLSID_AudioRendererCategory; +extern GUID IID_ICreateDevEnum; +extern GUID CLSID_SystemDeviceEnum; + +#ifndef __ICreateDevEnum_INTERFACE_DEFINED__ +#define __ICreateDevEnum_INTERFACE_DEFINED__ + +DECLARE_INTERFACE_(ICreateDevEnum, IUnknown) +{ + STDMETHOD(CreateClassEnumerator)(REFCLSID clsidDeviceClass, + IEnumMoniker **ppEnumMoniker, + DWORD dwFlags) PURE; +}; + +#endif // __ICreateDevEnum_INTERFACE_DEFINED__ #ifndef __IErrorLog_INTERFACE_DEFINED__ #define __IErrorLog_INTERFACE_DEFINED__ diff --git a/src/multimedia/audio/qaudioinput_win32_p.h b/src/multimedia/audio/qaudioinput_win32_p.h index 0f027a4a0..a7f156893 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.h +++ b/src/multimedia/audio/qaudioinput_win32_p.h @@ -53,9 +53,7 @@ #ifndef QAUDIOINPUTWIN_H #define QAUDIOINPUTWIN_H -#define NOMINMAX - -#include <windows.h> +#include <QtCore/qt_windows.h> #include <mmsystem.h> #include <QtCore/qfile.h> diff --git a/src/multimedia/audio/qaudiooutput_win32_p.h b/src/multimedia/audio/qaudiooutput_win32_p.h index 13c44c688..b28157ee1 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.h +++ b/src/multimedia/audio/qaudiooutput_win32_p.h @@ -53,9 +53,7 @@ #ifndef QAUDIOOUTPUTWIN_H #define QAUDIOOUTPUTWIN_H -#define NOMINMAX - -#include <windows.h> +#include <QtCore/qt_windows.h> #include <mmsystem.h> #include <QtCore/qdebug.h> |