From 7c787f11dd2348e0fd2cecc231f15a0acde7481a Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 13 Dec 2016 13:56:49 +0100
Subject: 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>
---
 .../directshow/player/directshowplayerservice.cpp        | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/plugins/directshow/player/directshowplayerservice.cpp')

diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index 1502c6df3..1554d194d 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -55,22 +55,24 @@
 #include "directshowvideorenderercontrol.h"
 
 
-#ifdef HAVE_EVR
+#if QT_CONFIG(evr)
 #include "directshowevrvideowindowcontrol.h"
 #endif
 
-#ifndef QT_NO_WMSDK
-#include <wmsdk.h>
-#endif
-
 #include "qmediacontent.h"
 
+#include <QtMultimedia/private/qtmultimedia-config_p.h>
+
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qthread.h>
 #include <QtCore/qvarlengtharray.h>
 
+#if QT_CONFIG(wmsdk)
+#  include <wmsdk.h>
+#endif
+
 #ifndef Q_CC_MINGW
 #  include <comdef.h>
 #endif
@@ -197,7 +199,7 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name)
         if (!m_videoRendererControl && !m_videoWindowControl) {
             IBaseFilter *filter;
 
-#ifdef HAVE_EVR
+#if QT_CONFIG(evr)
             DirectShowEvrVideoWindowControl *evrControl = new DirectShowEvrVideoWindowControl;
             if ((filter = evrControl->filter()))
                 m_videoWindowControl = evrControl;
@@ -980,7 +982,7 @@ void DirectShowPlayerService::doSeek(QMutexLocker *locker)
 
 int DirectShowPlayerService::bufferStatus() const
 {
-#ifndef QT_NO_WMSDK
+#if QT_CONFIG(wmsdk)
     QMutexLocker locker(const_cast<QMutex *>(&m_mutex));
 
     if (IWMReaderAdvanced2 *reader = com_cast<IWMReaderAdvanced2>(
-- 
cgit v1.2.3