summaryrefslogtreecommitdiffstats
path: root/src/multimedia/qmediaserviceprovider.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-01-20 13:45:37 +0100
committerLars Knoll <lars.knoll@qt.io>2021-01-29 08:47:33 +0000
commit39833f266589dedc014f045c8d42df1edb13fcec (patch)
treed0d45f7fa05f1d6f2838ae4b9a54640c16b419af /src/multimedia/qmediaserviceprovider.cpp
parented3301b9d4479f24b1588d802d4f017e394bd56b (diff)
Start using the new QMediaPlatformPlayerInterface
And get rid of the corresponding service plugins. Change-Id: I4b5b694e0cae93ba116a2dd58efd5ad8a2eb0743 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/qmediaserviceprovider.cpp')
-rw-r--r--src/multimedia/qmediaserviceprovider.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp
index fe7628fa0..35bf6ff38 100644
--- a/src/multimedia/qmediaserviceprovider.cpp
+++ b/src/multimedia/qmediaserviceprovider.cpp
@@ -50,13 +50,9 @@
#include "qvideodeviceselectorcontrol.h"
#if QT_CONFIG(gstreamer)
-#include <private/qgstreamerplayerserviceplugin_p.h>
#include <private/qgstreamercaptureserviceplugin_p.h>
-#elif defined(Q_OS_WIN)
-#include <private/wmfserviceplugin_p.h>
#elif defined(Q_OS_DARWIN)
#include <private/avfcameraserviceplugin_p.h>
-#include <private/avfmediaplayerserviceplugin_p.h>
#elif defined(Q_OS_ANDROID)
#include <private/qandroidmediaserviceplugin_p.h>
#elif defined(Q_OS_QNX)
@@ -82,14 +78,10 @@ class Loader
public:
QObject *instance(const QString &key) {
#if QT_CONFIG(gstreamer)
- GET_PLUGIN(Q_MEDIASERVICE_MEDIAPLAYER, QGstreamerPlayerServicePlugin)
GET_PLUGIN(Q_MEDIASERVICE_CAMERA, QGstreamerCaptureServicePlugin)
GET_PLUGIN(Q_MEDIASERVICE_AUDIOSOURCE, QGstreamerCaptureServicePlugin)
-#elif defined(Q_OS_WIN)
- GET_PLUGIN(Q_MEDIASERVICE_MEDIAPLAYER, WMFServicePlugin)
#elif defined(Q_OS_DARWIN)
GET_PLUGIN(Q_MEDIASERVICE_CAMERA, AVFServicePlugin)
- GET_PLUGIN(Q_MEDIASERVICE_MEDIAPLAYER, AVFMediaPlayerServicePlugin)
#elif defined(Q_OS_ANDROID)
GET_PLUGIN(Q_MEDIASERVICE_MEDIAPLAYER, QAndroidMediaServicePlugin)
GET_PLUGIN(Q_MEDIASERVICE_CAMERA, QAndroidMediaServicePlugin)