Clean up most QAbstractVideoSurface usages

The class is scheduled to be removed, once all it's
usages are gone. QVideoSink is the replacement going
forward.

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

2 files changed, 6 insertions, 11 deletions

diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index b2bad8e8f..663c24645 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -57,7 +57,6 @@
 #include "qdeclarativecamerafocus_p.h"
 #include "qdeclarativecameraimageprocessing_p.h"
 #include "qdeclarativetorch_p.h"
-#include <QAbstractVideoSurface>
 
 QML_DECLARE_TYPE(QSoundEffect)
 
@@ -158,7 +157,6 @@ public:
         // 5.15 types
         qmlRegisterType<QDeclarativeAudio, 15>(uri, 5, 15, "MediaPlayer");
         qmlRegisterType<QDeclarativeVideoOutput, 15>(uri, 5, 15, "VideoOutput");
-        qmlRegisterAnonymousType<QAbstractVideoSurface>(uri, 5);
 
         // The minor version used to be the current Qt 5 minor. For compatibility it is the last
         // Qt 5 release.
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index b84ae0e35..998ca5f2b 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -47,7 +47,6 @@
 
 #include "qdeclarativemediametadata_p.h"
 
-#include <QAbstractVideoSurface>
 #include <QTimerEvent>
 #include <QtQml/qqmlengine.h>
 
@@ -124,7 +123,7 @@ QDeclarativeAudio::~QDeclarativeAudio()
     \qmlproperty url QtMultimedia::MediaPlayer::videoOutput
 
     This property holds the target video output.
-    Accepts one or an array of QAbstractVideoSurface or VideoOutput elements.
+    Accepts one or an array of VideoOutput elements.
 
     \snippet multimedia-snippets/multiple-videooutputs.qml complete
 
@@ -152,8 +151,7 @@ void QDeclarativeAudio::setVideoOutput(const QVariant &v)
     if (sink) {
         m_player->setVideoOutput(sink);
     } else {
-#if 0
-        QList<QAbstractVideoSurface *> surfaces;
+        QList<QVideoSink *> sinks;
         // Check if it is an array.
         auto arr = v.value<QJSValue>();
         if (!arr.isNull()) {
@@ -163,15 +161,14 @@ void QDeclarativeAudio::setVideoOutput(const QVariant &v)
                 if (v.isQObject()) {
                     auto obj = v.toQObject();
                     vo = qobject_cast<QDeclarativeVideoOutput *>(obj);
-                    surface = vo ? vo->videoSink() : qobject_cast<QAbstractVideoSurface *>(obj);
-                    if (surface)
-                        surfaces.append(surface);
+                    sink = vo ? vo->videoSink() : qobject_cast<QVideoSink *>(obj);
+                    if (sink)
+                        sinks.append(sink);
                 }
             }
         }
 
-        m_player->setVideoOutput(surfaces);
-#endif
+        m_player->setVideoOutput(sinks);
     }
 
     m_videoOutput = v;