diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-12-13 13:56:49 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-02-03 12:46:38 +0000 |
| commit | 7c787f11dd2348e0fd2cecc231f15a0acde7481a (patch) | |
| tree | 10ac13b4b806dea9d1783c72057982252e06282f /src/plugins/directshow/player/directshowmetadatacontrol.cpp | |
| parent | dd4c9cbd405730b360cb6aed572006078d88cecb (diff) | |
DirectShow: Port to new configure system (evr, wmsdk)
Replace old legacy defines by QT_CONFIG. Fixes warnings when using MinGW:
qtmultimedia/src/multimedia/qtmultimedia-config.h:4:0: warning: "QT_NO_WMSDK" redefined
Change-Id: Ifbfc2cea3bf5bfd06d94fd70e6ea4afb6d6fbb4b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/directshow/player/directshowmetadatacontrol.cpp')
| -rw-r--r-- | src/plugins/directshow/player/directshowmetadatacontrol.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp index 6a88d76a9..ccd408a8a 100644 --- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp +++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp @@ -57,7 +57,9 @@ #include "directshowmetadatacontrol.h" #include "directshowplayerservice.h" -#ifndef QT_NO_WMSDK +#include <QtMultimedia/private/qtmultimedia-config_p.h> + +#if QT_CONFIG(wmsdk) #include <wmsdk.h> #endif @@ -108,7 +110,7 @@ typedef HRESULT (WINAPI *q_SHCreateItemFromParsingName)(PCWSTR, IBindCtx *, cons static q_SHCreateItemFromParsingName sHCreateItemFromParsingName = 0; #endif -#ifndef QT_NO_WMSDK +#if QT_CONFIG(wmsdk) namespace { @@ -513,7 +515,7 @@ void DirectShowMetaDataControl::updateMetadata(IFilterGraph2 *graph, IBaseFilter goto send_event; #endif -#ifndef QT_NO_WMSDK +#if QT_CONFIG(wmsdk) IWMHeaderInfo *info = com_cast<IWMHeaderInfo>(source, IID_IWMHeaderInfo); if (info) { |