First step in cleaning up the plugin loading code

Stop assuming that there are multiple plugins providing
the same service. We'll have exactly one plugin for a
service in the future and not provide several.

The reason is that we will focus on having one good and
functional multimedia backend per platform, not the mix
of many semi-functional ones as we have today.

Change-Id: I809d4c99a56a48369d0ba283af78b1c41740d92a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

4 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
index 177e230b0..476cc2394 100644
--- a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
@@ -89,13 +89,13 @@ void CameraBinServicePlugin::release(QMediaService *service)
     delete service;
 }
 
-QMediaServiceProviderHint::Features CameraBinServicePlugin::supportedFeatures(
+QMediaServiceFeaturesInterface::Features CameraBinServicePlugin::supportedFeatures(
         const QByteArray &service) const
 {
     if (service == Q_MEDIASERVICE_CAMERA)
-        return QMediaServiceProviderHint::VideoSurface;
+        return QMediaServiceFeaturesInterface::VideoSurface;
 
-    return QMediaServiceProviderHint::Features();
+    return QMediaServiceFeaturesInterface::Features();
 }
 
 QByteArray CameraBinServicePlugin::defaultDevice(const QByteArray &service) const
diff --git a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.h b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.h
index e16a0d9cc..50eb52d45 100644
--- a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.h
+++ b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.h
@@ -66,7 +66,7 @@ public:
     QMediaService* create(const QString &key) override;
     void release(QMediaService *service) override;
 
-    QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const override;
+    QMediaServiceFeaturesInterface::Features supportedFeatures(const QByteArray &service) const override;
 
     QByteArray defaultDevice(const QByteArray &service) const override;
     QList<QByteArray> devices(const QByteArray &service) const override;
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp
index 59302f1d2..03a599761 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp
@@ -66,17 +66,17 @@ void QGstreamerPlayerServicePlugin::release(QMediaService *service)
     delete service;
 }
 
-QMediaServiceProviderHint::Features QGstreamerPlayerServicePlugin::supportedFeatures(
+QMediaServiceFeaturesInterface::Features QGstreamerPlayerServicePlugin::supportedFeatures(
         const QByteArray &service) const
 {
     if (service == Q_MEDIASERVICE_MEDIAPLAYER)
         return
 #if QT_CONFIG(gstreamer_app)
-                QMediaServiceProviderHint::StreamPlayback |
+                QMediaServiceFeaturesInterface::StreamPlayback |
 #endif
-                QMediaServiceProviderHint::VideoSurface;
+                QMediaServiceFeaturesInterface::VideoSurface;
     else
-        return QMediaServiceProviderHint::Features();
+        return QMediaServiceFeaturesInterface::Features();
 }
 
 QMultimedia::SupportEstimate QGstreamerPlayerServicePlugin::hasSupport(const QString &mimeType,
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.h
index 71eece23e..6cc7a7007 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.h
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.h
@@ -61,7 +61,7 @@ public:
     QMediaService* create(const QString &key) override;
     void release(QMediaService *service) override;
 
-    QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const override;
+    QMediaServiceFeaturesInterface::Features supportedFeatures(const QByteArray &service) const override;
 
     QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList &codecs) const override;
     QStringList supportedMimeTypes() const override;