summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/dsserviceplugin.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/directshow/dsserviceplugin.h')
-rw-r--r--src/plugins/directshow/dsserviceplugin.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/directshow/dsserviceplugin.h b/src/plugins/directshow/dsserviceplugin.h
index f3f89d7cd..82f1acd6d 100644
--- a/src/plugins/directshow/dsserviceplugin.h
+++ b/src/plugins/directshow/dsserviceplugin.h
@@ -54,7 +54,13 @@ class DSServicePlugin
Q_OBJECT
Q_INTERFACES(QMediaServiceSupportedDevicesInterface)
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).
+#ifdef QMEDIA_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);