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/directshowvideorenderercontrol.cpp | |
| parent | dd4c9cbd405730b360cb6aed572006078d88cecb (diff) | |
| download | qtmultimedia-7c787f11dd2348e0fd2cecc231f15a0acde7481a.tar.gz | |
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/directshowvideorenderercontrol.cpp')
| -rw-r--r-- | src/plugins/directshow/player/directshowvideorenderercontrol.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/directshow/player/directshowvideorenderercontrol.cpp b/src/plugins/directshow/player/directshowvideorenderercontrol.cpp index b86125df9..b726040b3 100644 --- a/src/plugins/directshow/player/directshowvideorenderercontrol.cpp +++ b/src/plugins/directshow/player/directshowvideorenderercontrol.cpp @@ -41,7 +41,7 @@ #include "videosurfacefilter.h" -#ifdef HAVE_EVR +#if QT_CONFIG(evr) #include "evrcustompresenter.h" #endif @@ -52,7 +52,7 @@ DirectShowVideoRendererControl::DirectShowVideoRendererControl(DirectShowEventLo , m_loop(loop) , m_surface(0) , m_filter(0) -#ifdef HAVE_EVR +#if QT_CONFIG(evr) , m_evrPresenter(0) #endif { @@ -60,7 +60,7 @@ DirectShowVideoRendererControl::DirectShowVideoRendererControl(DirectShowEventLo DirectShowVideoRendererControl::~DirectShowVideoRendererControl() { -#ifdef HAVE_EVR +#if QT_CONFIG(evr) if (m_evrPresenter) { m_evrPresenter->setSurface(Q_NULLPTR); m_evrPresenter->Release(); @@ -80,7 +80,7 @@ void DirectShowVideoRendererControl::setSurface(QAbstractVideoSurface *surface) if (m_surface == surface) return; -#ifdef HAVE_EVR +#if QT_CONFIG(evr) if (m_evrPresenter) { m_evrPresenter->setSurface(Q_NULLPTR); m_evrPresenter->Release(); @@ -96,7 +96,7 @@ void DirectShowVideoRendererControl::setSurface(QAbstractVideoSurface *surface) m_surface = surface; if (m_surface) { -#ifdef HAVE_EVR +#if QT_CONFIG(evr) m_filter = com_new<IBaseFilter>(clsid_EnhancedVideoRenderer); m_evrPresenter = new EVRCustomPresenter(m_surface); if (!m_evrPresenter->isValid() || !qt_evr_setCustomPresenter(m_filter, m_evrPresenter)) { |