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>

1 files changed, 21 insertions, 9 deletions

diff --git a/src/multimedia/platform/windows/player/mfplayerservice_p.h b/src/multimedia/platform/windows/player/mfplayerservice_p.h
index 11b34f819..26fd2d8df 100644
--- a/src/multimedia/platform/windows/player/mfplayerservice_p.h
+++ b/src/multimedia/platform/windows/player/mfplayerservice_p.h
@@ -57,6 +57,7 @@
 #include "qmediaplayer.h"
 #include "qmediaservice.h"
 #include "qmediatimerange.h"
+#include <private/qmediaplatformplayerinterface_p.h>
 
 QT_BEGIN_NAMESPACE
 class QUrl;
@@ -70,26 +71,37 @@ class MFPlayerControl;
 class MFMetaDataControl;
 class MFPlayerSession;
 
-class MFPlayerService : public QMediaService
+class MFPlayerService : public QMediaPlatformPlayerInterface
 {
     Q_OBJECT
 public:
-    MFPlayerService(QObject *parent = 0);
+    MFPlayerService();
     ~MFPlayerService();
 
-    QObject *requestControl(const char *name);
-    void releaseControl(QObject *control);
+    QObject *requestControl(const char *name) override;
+    void releaseControl(QObject *control) override;
+
+    QMediaPlayerControl *player() override;
+    QMetaDataReaderControl *dataReader() override;
+    // ### QMediaStreamsControl *streams() override;
+    QMediaVideoProbeControl *videoProbe() override;
+    void releaseVideoProbe(QMediaVideoProbeControl *) override;
+    QMediaAudioProbeControl *audioProbe() override;
+    void releaseAudioProbe(QMediaAudioProbeControl *) override;
+
+    virtual QVideoRendererControl *createVideoRenderer() override;
+    virtual QVideoWindowControl *createVideoWindow() override;
 
     MFVideoRendererControl* videoRendererControl() const;
     MFEvrVideoWindowControl* videoWindowControl() const;
     MFMetaDataControl* metaDataControl() const;
 
 private:
-    MFPlayerSession *m_session;
-    MFVideoRendererControl *m_videoRendererControl;
-    MFEvrVideoWindowControl *m_videoWindowControl;
-    MFPlayerControl        *m_player;
-    MFMetaDataControl      *m_metaDataControl;
+    MFPlayerSession *m_session = nullptr;
+    MFVideoRendererControl *m_videoRendererControl = nullptr;
+    MFEvrVideoWindowControl *m_videoWindowControl = nullptr;
+    MFPlayerControl        *m_player = nullptr;
+    MFMetaDataControl      *m_metaDataControl = nullptr;
 };
 
 #endif