Rename QGstreamerVideoWindow to QGstreamerVideoSink

This will be able to handle non windowed output as well
in the future.

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

5 files changed, 38 insertions, 38 deletions

diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideooutput.cpp b/src/multimedia/platform/gstreamer/common/qgstreamervideooutput.cpp
index 73933ce43..c2bfd79fc 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamervideooutput.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideooutput.cpp
@@ -39,7 +39,7 @@
 
 #include <private/qgstreamervideooutput_p.h>
 #include <private/qgstreamervideorenderer_p.h>
-#include <private/qgstreamervideowindow_p.h>
+#include <private/qgstreamervideosink_p.h>
 #include <qvideosink.h>
 
 #include <QtCore/qloggingcategory.h>
@@ -113,7 +113,7 @@ void QGstreamerVideoOutput::setVideoSurface(QAbstractVideoSurface *surface)
 
 void QGstreamerVideoOutput::setVideoSink(QVideoSink *sink)
 {
-    auto *videoSink = static_cast<QGstreamerVideoWindow *>(sink->platformVideoSink());
+    auto *videoSink = static_cast<QGstreamerVideoSink *>(sink->platformVideoSink());
     if (m_videoWindow) {
         gstPipeline.removeMessageFilter(static_cast<QGstreamerSyncMessageFilter *>(m_videoWindow));
         gstPipeline.removeMessageFilter(static_cast<QGstreamerBusMessageFilter *>(m_videoWindow));
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideooutput_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideooutput_p.h
index fa6ec3fad..abe33a724 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamervideooutput_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideooutput_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 class QGstreamerVideoRenderer;
 class QAbstractVideoSurface;
 class QVideoSink;
-class QGstreamerVideoWindow;
+class QGstreamerVideoSink;
 
 class Q_MULTIMEDIA_EXPORT QGstreamerVideoOutput : public QObject
 {
@@ -86,7 +86,7 @@ private:
     QAbstractVideoSurface *m_videoSurface = nullptr;
     QVideoSink *m_videoSink = nullptr;
     QGstreamerVideoRenderer *m_videoOutput = nullptr;
-    QGstreamerVideoWindow *m_videoWindow = nullptr;
+    QGstreamerVideoSink *m_videoWindow = nullptr;
 
     // Gst elements
     QGstPipeline gstPipeline;
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideowindow.cpp b/src/multimedia/platform/gstreamer/common/qgstreamervideosink.cpp
index 4dc5f9daf..900ce835e 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamervideowindow.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideosink.cpp
@@ -37,40 +37,40 @@
 **
 ****************************************************************************/
 
-#include "qgstreamervideowindow_p.h"
+#include "qgstreamervideosink_p.h"
 #include <private/qgstutils_p.h>
 
 #include <QtCore/qdebug.h>
 
-QGstreamerVideoWindow::QGstreamerVideoWindow(QObject *parent, const QByteArray &elementName)
+QGstreamerVideoSink::QGstreamerVideoSink(QObject *parent, const QByteArray &elementName)
     : QPlatformVideoSink(parent)
     , m_videoOverlay(this, !elementName.isEmpty() ? elementName : qgetenv("QT_GSTREAMER_WINDOW_VIDEOSINK"))
 {
     connect(&m_videoOverlay, &QGstreamerVideoOverlay::nativeVideoSizeChanged,
-            this, &QGstreamerVideoWindow::nativeSizeChanged);
+            this, &QGstreamerVideoSink::nativeSizeChanged);
     connect(&m_videoOverlay, &QGstreamerVideoOverlay::brightnessChanged,
-            this, &QGstreamerVideoWindow::brightnessChanged);
+            this, &QGstreamerVideoSink::brightnessChanged);
     connect(&m_videoOverlay, &QGstreamerVideoOverlay::contrastChanged,
-            this, &QGstreamerVideoWindow::contrastChanged);
+            this, &QGstreamerVideoSink::contrastChanged);
     connect(&m_videoOverlay, &QGstreamerVideoOverlay::hueChanged,
-            this, &QGstreamerVideoWindow::hueChanged);
+            this, &QGstreamerVideoSink::hueChanged);
     connect(&m_videoOverlay, &QGstreamerVideoOverlay::saturationChanged,
-            this, &QGstreamerVideoWindow::saturationChanged);
+            this, &QGstreamerVideoSink::saturationChanged);
 }
 
-QGstreamerVideoWindow::~QGstreamerVideoWindow() = default;
+QGstreamerVideoSink::~QGstreamerVideoSink() = default;
 
-GstElement *QGstreamerVideoWindow::videoSink()
+GstElement *QGstreamerVideoSink::videoSink()
 {
     return m_videoOverlay.videoSink();
 }
 
-WId QGstreamerVideoWindow::winId() const
+WId QGstreamerVideoSink::winId() const
 {
     return m_windowId;
 }
 
-void QGstreamerVideoWindow::setWinId(WId id)
+void QGstreamerVideoSink::setWinId(WId id)
 {
     if (m_windowId == id)
         return;
@@ -85,93 +85,93 @@ void QGstreamerVideoWindow::setWinId(WId id)
         emit readyChanged(false);
 }
 
-bool QGstreamerVideoWindow::processSyncMessage(const QGstreamerMessage &message)
+bool QGstreamerVideoSink::processSyncMessage(const QGstreamerMessage &message)
 {
     return m_videoOverlay.processSyncMessage(message);
 }
 
-bool QGstreamerVideoWindow::processBusMessage(const QGstreamerMessage &message)
+bool QGstreamerVideoSink::processBusMessage(const QGstreamerMessage &message)
 {
     return m_videoOverlay.processBusMessage(message);
 }
 
-QRect QGstreamerVideoWindow::displayRect() const
+QRect QGstreamerVideoSink::displayRect() const
 {
     return m_displayRect;
 }
 
-void QGstreamerVideoWindow::setDisplayRect(const QRect &rect)
+void QGstreamerVideoSink::setDisplayRect(const QRect &rect)
 {
     m_videoOverlay.setRenderRectangle(m_displayRect = rect);
     repaint();
 }
 
-Qt::AspectRatioMode QGstreamerVideoWindow::aspectRatioMode() const
+Qt::AspectRatioMode QGstreamerVideoSink::aspectRatioMode() const
 {
     return m_videoOverlay.aspectRatioMode();
 }
 
-void QGstreamerVideoWindow::setAspectRatioMode(Qt::AspectRatioMode mode)
+void QGstreamerVideoSink::setAspectRatioMode(Qt::AspectRatioMode mode)
 {
     m_videoOverlay.setAspectRatioMode(mode);
 }
 
-void QGstreamerVideoWindow::repaint()
+void QGstreamerVideoSink::repaint()
 {
     m_videoOverlay.expose();
 }
 
-int QGstreamerVideoWindow::brightness() const
+int QGstreamerVideoSink::brightness() const
 {
     return m_videoOverlay.brightness();
 }
 
-void QGstreamerVideoWindow::setBrightness(int brightness)
+void QGstreamerVideoSink::setBrightness(int brightness)
 {
     m_videoOverlay.setBrightness(brightness);
 }
 
-int QGstreamerVideoWindow::contrast() const
+int QGstreamerVideoSink::contrast() const
 {
     return m_videoOverlay.contrast();
 }
 
-void QGstreamerVideoWindow::setContrast(int contrast)
+void QGstreamerVideoSink::setContrast(int contrast)
 {
     m_videoOverlay.setContrast(contrast);
 }
 
-int QGstreamerVideoWindow::hue() const
+int QGstreamerVideoSink::hue() const
 {
     return m_videoOverlay.hue();
 }
 
-void QGstreamerVideoWindow::setHue(int hue)
+void QGstreamerVideoSink::setHue(int hue)
 {
     m_videoOverlay.setHue(hue);
 }
 
-int QGstreamerVideoWindow::saturation() const
+int QGstreamerVideoSink::saturation() const
 {
     return m_videoOverlay.saturation();
 }
 
-void QGstreamerVideoWindow::setSaturation(int saturation)
+void QGstreamerVideoSink::setSaturation(int saturation)
 {
     m_videoOverlay.setSaturation(saturation);
 }
 
-bool QGstreamerVideoWindow::isFullScreen() const
+bool QGstreamerVideoSink::isFullScreen() const
 {
     return m_fullScreen;
 }
 
-void QGstreamerVideoWindow::setFullScreen(bool fullScreen)
+void QGstreamerVideoSink::setFullScreen(bool fullScreen)
 {
     emit fullScreenChanged(m_fullScreen = fullScreen);
 }
 
-QSize QGstreamerVideoWindow::nativeSize() const
+QSize QGstreamerVideoSink::nativeSize() const
 {
     return m_videoOverlay.nativeVideoSize();
 }
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideowindow_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideosink_p.h
index 7d1ff05ff..57476a5d7 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamervideowindow_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideosink_p.h
@@ -61,15 +61,15 @@
 QT_BEGIN_NAMESPACE
 class QAbstractVideoSurface;
 
-class Q_MULTIMEDIA_EXPORT QGstreamerVideoWindow :
+class Q_MULTIMEDIA_EXPORT QGstreamerVideoSink :
         public QPlatformVideoSink,
         public QGstreamerSyncMessageFilter,
         public QGstreamerBusMessageFilter
 {
     Q_OBJECT
 public:
-    explicit QGstreamerVideoWindow(QObject *parent = 0, const QByteArray &elementName = QByteArray());
-    ~QGstreamerVideoWindow();
+    explicit QGstreamerVideoSink(QObject *parent = 0, const QByteArray &elementName = QByteArray());
+    ~QGstreamerVideoSink();
 
     WId winId() const override;
     void setWinId(WId id) override;
diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
index 7770d50d8..e1e5e4f34 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
+++ b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
@@ -44,7 +44,7 @@
 #include "private/qgstreameraudiodecoder_p.h"
 #include "private/qgstreamerformatinfo_p.h"
 #include "private/qgstreamervideorenderer_p.h"
-#include "private/qgstreamervideowindow_p.h"
+#include "private/qgstreamervideosink_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -90,7 +90,7 @@ QPlatformMediaPlayer *QGstreamerIntegration::createPlayer(QMediaPlayer *player)
 
 QPlatformVideoSink *QGstreamerIntegration::createVideoSink()
 {
-    return new QGstreamerVideoWindow();
+    return new QGstreamerVideoSink();
 }
 
 QT_END_NAMESPACE