Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	src/plugins/directshow/player/directshowplayerservice.cpp

Change-Id: I482098bb3c3b5b291175ca798b0d6ba61ad87d86

4 files changed, 12 insertions, 11 deletions

diff --git a/src/plugins/directshow/player/directshowevrvideowindowcontrol.cpp b/src/plugins/directshow/player/directshowevrvideowindowcontrol.cpp
index fc1058d57..57d88326c 100644
--- a/src/plugins/directshow/player/directshowevrvideowindowcontrol.cpp
+++ b/src/plugins/directshow/player/directshowevrvideowindowcontrol.cpp
@@ -43,7 +43,7 @@
 
 DirectShowEvrVideoWindowControl::DirectShowEvrVideoWindowControl(QObject *parent)
     : EvrVideoWindowControl(parent)
-    , m_evrFilter(NULL)
+    , m_evrFilter(nullptr)
 {
 }
 
@@ -59,7 +59,7 @@ IBaseFilter *DirectShowEvrVideoWindowControl::filter()
         m_evrFilter = com_new<IBaseFilter>(clsid_EnhancedVideoRenderer);
         if (!setEvr(m_evrFilter)) {
             m_evrFilter->Release();
-            m_evrFilter = NULL;
+            m_evrFilter = nullptr;
         }
     }
 
diff --git a/src/plugins/directshow/player/directshowioreader.cpp b/src/plugins/directshow/player/directshowioreader.cpp
index 3482cee02..c10d9a239 100644
--- a/src/plugins/directshow/player/directshowioreader.cpp
+++ b/src/plugins/directshow/player/directshowioreader.cpp
@@ -96,7 +96,7 @@ DirectShowIOReader::DirectShowIOReader(
 {
     moveToThread(device->thread());
 
-    connect(device, SIGNAL(readyRead()), this, SLOT(readyRead()));
+    connect(device, &QIODevice::readyRead, this, &DirectShowIOReader::readyRead);
 }
 
 DirectShowIOReader::~DirectShowIOReader()
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index 5f7c65ad0..f5249e191 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -137,7 +137,7 @@ DirectShowPlayerService::DirectShowPlayerService(QObject *parent)
     , m_pendingTasks(0)
     , m_executingTask(0)
     , m_executedTasks(0)
-    , m_taskHandle(::CreateEvent(0, 0, 0, 0))
+    , m_taskHandle(::CreateEvent(nullptr, FALSE, FALSE, nullptr))
     , m_eventHandle(0)
     , m_graphStatus(NoMedia)
     , m_stream(0)
@@ -210,8 +210,8 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name)
         if (!m_videoRendererControl && !m_videoWindowControl) {
             m_videoRendererControl = new DirectShowVideoRendererControl(m_loop);
 
-            connect(m_videoRendererControl, SIGNAL(filterChanged()),
-                    this, SLOT(videoOutputChanged()));
+            connect(m_videoRendererControl, &DirectShowVideoRendererControl::filterChanged,
+                    this, &DirectShowPlayerService::videoOutputChanged);
 
             return m_videoRendererControl;
         }
@@ -299,6 +299,7 @@ void DirectShowPlayerService::load(const QMediaContent &media, QIODevice *stream
         releaseGraph();
 
     m_url = media.canonicalUrl();
+
     m_stream = stream;
     m_error = QMediaPlayer::NoError;
     m_errorString = QString();
diff --git a/src/plugins/directshow/player/videosurfacefilter.cpp b/src/plugins/directshow/player/videosurfacefilter.cpp
index 74d59231c..4702d5908 100644
--- a/src/plugins/directshow/player/videosurfacefilter.cpp
+++ b/src/plugins/directshow/player/videosurfacefilter.cpp
@@ -222,16 +222,16 @@ HRESULT VideoSurfaceInputPin::Receive(IMediaSample *pMediaSample)
 VideoSurfaceFilter::VideoSurfaceFilter(QAbstractVideoSurface *surface, DirectShowEventLoop *loop, QObject *parent)
     : QObject(parent)
     , m_loop(loop)
-    , m_pin(NULL)
+    , m_pin(nullptr)
     , m_surface(surface)
     , m_bytesPerLine(0)
     , m_surfaceStarted(false)
     , m_renderMutex(QMutex::Recursive)
     , m_running(false)
-    , m_pendingSample(NULL)
+    , m_pendingSample(nullptr)
     , m_pendingSampleEndTime(0)
-    , m_renderEvent(CreateEvent(NULL, FALSE, FALSE, NULL))
-    , m_flushEvent(CreateEvent(NULL, TRUE, FALSE, NULL))
+    , m_renderEvent(CreateEvent(nullptr, FALSE, FALSE, nullptr))
+    , m_flushEvent(CreateEvent(nullptr, TRUE, FALSE, nullptr))
     , m_adviseCookie(0)
     , m_EOS(false)
     , m_EOSDelivered(false)
@@ -616,7 +616,7 @@ void VideoSurfaceFilter::clearPendingSample()
     if (m_pendingSample) {
         qCDebug(qLcRenderFilter, "clearPendingSample");
         m_pendingSample->Release();
-        m_pendingSample = NULL;
+        m_pendingSample = nullptr;
     }
 }