1 files changed, 12 insertions, 18 deletions
diff --git a/src/plugins/directshow/common/directshowbasefilter.cpp b/src/plugins/directshow/common/directshowbasefilter.cpp
index d64021ed6..3a13dce0e 100644
--- a/src/plugins/directshow/common/directshowbasefilter.cpp
+++ b/src/plugins/directshow/common/directshowbasefilter.cpp
@@ -41,17 +41,12 @@
 
 #include "directshowpinenum.h"
 
+#include <mutex>
+
 QT_BEGIN_NAMESPACE
 
 DirectShowBaseFilter::DirectShowBaseFilter()
-    : m_mutex(QMutex::Recursive)
-    , m_state(State_Stopped)
-    , m_graph(nullptr)
-    , m_clock(nullptr)
-    , m_sink(nullptr)
-{
-
-}
+    = default;
 
 DirectShowBaseFilter::~DirectShowBaseFilter()
 {
@@ -75,15 +70,14 @@ HRESULT DirectShowBaseFilter::NotifyEvent(long eventCode, LONG_PTR eventParam1,
             eventParam2 = (LONG_PTR)(IBaseFilter*)this;
 
         return sink->Notify(eventCode, eventParam1, eventParam2);
-    } else {
-        return E_NOTIMPL;
     }
+    return E_NOTIMPL;
 }
 
 HRESULT DirectShowBaseFilter::Run(REFERENCE_TIME tStart)
 {
     Q_UNUSED(tStart)
-    QMutexLocker locker(&m_mutex);
+    const std::lock_guard<QRecursiveMutex> locker(m_mutex);
 
     m_startTime = tStart;
 
@@ -100,7 +94,7 @@ HRESULT DirectShowBaseFilter::Run(REFERENCE_TIME tStart)
 
 HRESULT DirectShowBaseFilter::Pause()
 {
-    QMutexLocker locker(&m_mutex);
+    const std::lock_guard<QRecursiveMutex> locker(m_mutex);
 
     if (m_state == State_Stopped) {
         const QList<DirectShowPin *> pinList = pins();
@@ -120,7 +114,7 @@ HRESULT DirectShowBaseFilter::Pause()
 
 HRESULT DirectShowBaseFilter::Stop()
 {
-    QMutexLocker locker(&m_mutex);
+    const std::lock_guard<QRecursiveMutex> locker(m_mutex);
 
     HRESULT hr = S_OK;
 
@@ -147,7 +141,7 @@ HRESULT DirectShowBaseFilter::GetState(DWORD dwMilliSecsTimeout, FILTER_STATE *p
     if (!pState) {
         return E_POINTER;
     } else {
-        QMutexLocker locker(&m_mutex);
+        const std::lock_guard<QRecursiveMutex> locker(m_mutex);
 
         *pState = m_state;
 
@@ -157,7 +151,7 @@ HRESULT DirectShowBaseFilter::GetState(DWORD dwMilliSecsTimeout, FILTER_STATE *p
 
 HRESULT DirectShowBaseFilter::SetSyncSource(IReferenceClock *pClock)
 {
-    QMutexLocker locker(&m_mutex);
+    const std::lock_guard<QRecursiveMutex> locker(m_mutex);
 
     if (m_clock)
         m_clock->Release();
@@ -197,7 +191,7 @@ HRESULT DirectShowBaseFilter::FindPin(LPCWSTR Id, IPin **ppPin)
     if (!ppPin || !Id)
         return E_POINTER;
 
-    QMutexLocker locker(&m_mutex);
+    const std::lock_guard<QRecursiveMutex> locker(m_mutex);
     const QList<DirectShowPin *> pinList = pins();
     for (DirectShowPin *pin : pinList) {
         if (pin->name() == QStringView(Id)) {
@@ -207,13 +201,13 @@ HRESULT DirectShowBaseFilter::FindPin(LPCWSTR Id, IPin **ppPin)
         }
     }
 
-    *ppPin = 0;
+    *ppPin = nullptr;
     return VFW_E_NOT_FOUND;
 }
 
 HRESULT DirectShowBaseFilter::JoinFilterGraph(IFilterGraph *pGraph, LPCWSTR pName)
 {
-    QMutexLocker locker(&m_mutex);
+    const std::lock_guard<QRecursiveMutex> locker(m_mutex);
 
     m_filterName = QString::fromWCharArray(pName);
     m_graph = pGraph;