Windows: Build directshow media player with wmf if available

Removed -mediaplayer-backend configure param.
It allows to build directshow media player together with wmf's one,
if the last is available.

It is useful to switch to another backend without rebuilding.

By default directshow media player will be used.

[ChangeLog][Platform Specific Changes][Windows] Removed
-mediaplayer-backend config param which allowed to build wmf
together with DirectShow.

Task-number: QTBUG-32783
Change-Id: I486a93d9493407af3793cfe338b35daab7c642db
Reviewed-by: Andy Shaw <andy.shaw@qt.io>

4 files changed, 3 insertions, 17 deletions

diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index 54d617166..e531efc53 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -17,12 +17,11 @@ mingw {
 }
 
 include(common/common.pri)
-qtConfig(directshow-player): include(player/player.pri)
+include(player/player.pri)
 include(camera/camera.pri)
 
 OTHER_FILES += \
-    directshow.json \
-    directshow_camera.json
+    directshow.json
 
 PLUGIN_TYPE = mediaservice
 PLUGIN_CLASS_NAME = DSServicePlugin
diff --git a/src/plugins/directshow/directshow_camera.json b/src/plugins/directshow/directshow_camera.json
deleted file mode 100644
index c37ce2c9a..000000000
--- a/src/plugins/directshow/directshow_camera.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "Keys": ["directshow"],
-    "Services": ["org.qt-project.qt.camera"]
-}
diff --git a/src/plugins/directshow/dsserviceplugin.cpp b/src/plugins/directshow/dsserviceplugin.cpp
index 64b30f561..727a11b55 100644
--- a/src/plugins/directshow/dsserviceplugin.cpp
+++ b/src/plugins/directshow/dsserviceplugin.cpp
@@ -51,9 +51,7 @@
 #include <dshow.h>
 #include "dscameraservice.h"
 
-#if QT_CONFIG(directshow_player)
 #include "directshowplayerservice.h"
-#endif
 
 #include <qmediaserviceproviderplugin.h>
 
@@ -95,12 +93,11 @@ QMediaService* DSServicePlugin::create(QString const& key)
         addRefCount();
         return new DSCameraService;
     }
-#if QT_CONFIG(directshow_player)
+
     if (key == QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER)) {
         addRefCount();
         return new DirectShowPlayerService;
     }
-#endif
 
     return 0;
 }
diff --git a/src/plugins/directshow/dsserviceplugin.h b/src/plugins/directshow/dsserviceplugin.h
index 2e87058c3..55db9310c 100644
--- a/src/plugins/directshow/dsserviceplugin.h
+++ b/src/plugins/directshow/dsserviceplugin.h
@@ -55,13 +55,7 @@ class DSServicePlugin
     Q_INTERFACES(QMediaServiceSupportedDevicesInterface)
     Q_INTERFACES(QMediaServiceDefaultDeviceInterface)
     Q_INTERFACES(QMediaServiceFeaturesInterface)
-    // The player service provided by the WMF-plugin should preferably be used.
-    // DirectShow should then only provide the camera (see QTBUG-29172, QTBUG-29175).
-#if QT_CONFIG(directshow_player)
     Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "directshow.json")
-#else
-    Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "directshow_camera.json")
-#endif
 
 public:
     QMediaService* create(QString const& key) override;