1 files changed, 39 insertions, 53 deletions

diff --git a/src/plugins/directshow/common/directshowpin.cpp b/src/plugins/directshow/common/directshowpin.cpp
index 0dae72d0a..508a9b21d 100644
--- a/src/plugins/directshow/common/directshowpin.cpp
+++ b/src/plugins/directshow/common/directshowpin.cpp
@@ -230,70 +230,60 @@ HRESULT DirectShowPin::Disconnect()
 
 HRESULT DirectShowPin::ConnectedTo(IPin **ppPin)
 {
-    if (!ppPin) {
+    if (!ppPin)
         return E_POINTER;
-    } else {
-        QMutexLocker locker(&m_mutex);
-
-        if (!m_peerPin) {
-            *ppPin = 0;
-            return VFW_E_NOT_CONNECTED;
-        } else {
-            m_peerPin->AddRef();
-            *ppPin = m_peerPin;
-            return S_OK;
-        }
+
+    QMutexLocker locker(&m_mutex);
+    if (!m_peerPin) {
+        *ppPin = 0;
+        return VFW_E_NOT_CONNECTED;
     }
+    m_peerPin->AddRef();
+    *ppPin = m_peerPin;
+    return S_OK;
 }
 
 HRESULT DirectShowPin::ConnectionMediaType(AM_MEDIA_TYPE *pmt)
 {
-    if (!pmt) {
+    if (!pmt)
         return E_POINTER;
-    } else {
-        QMutexLocker locker(&m_mutex);
 
-        if (!m_peerPin) {
-            DirectShowMediaType::init(pmt);
-            return VFW_E_NOT_CONNECTED;
-        } else {
-            DirectShowMediaType::copy(pmt, &m_mediaType);
-            return S_OK;
-        }
+    QMutexLocker locker(&m_mutex);
+    if (!m_peerPin) {
+        DirectShowMediaType::init(pmt);
+        return VFW_E_NOT_CONNECTED;
     }
+    DirectShowMediaType::copy(pmt, &m_mediaType);
+    return S_OK;
 }
 
 HRESULT DirectShowPin::QueryPinInfo(PIN_INFO *pInfo)
 {
-    if (!pInfo) {
+    if (!pInfo)
         return E_POINTER;
-    } else {
-        pInfo->pFilter = m_filter;
-        if (m_filter) {
-            m_filter->AddRef();
-        }
-        pInfo->dir = m_direction;
 
-        QString name = m_name;
-        if (name.length() >= MAX_PIN_NAME)
-            name.truncate(MAX_PIN_NAME - 1);
-        int length = name.toWCharArray(pInfo->achName);
-        pInfo->achName[length] = '\0';
+    pInfo->pFilter = m_filter;
+    if (m_filter)
+        m_filter->AddRef();
+    pInfo->dir = m_direction;
 
-        return S_OK;
-    }
+    QString name = m_name;
+    if (name.length() >= MAX_PIN_NAME)
+        name.truncate(MAX_PIN_NAME - 1);
+    int length = name.toWCharArray(pInfo->achName);
+    pInfo->achName[length] = '\0';
+
+    return S_OK;
 }
 
 HRESULT DirectShowPin::QueryId(LPWSTR *Id)
 {
-    if (!Id) {
+    if (!Id)
         return E_POINTER;
-    } else {
-        const int bytes = (m_name.length() + 1) * 2;
-        *Id = static_cast<LPWSTR>(::CoTaskMemAlloc(bytes));
-        ::memcpy(*Id, m_name.utf16(), bytes);
-        return S_OK;
-    }
+    const int bytes = (m_name.length() + 1) * 2;
+    *Id = static_cast<LPWSTR>(::CoTaskMemAlloc(bytes));
+    ::memcpy(*Id, m_name.utf16(), bytes);
+    return S_OK;
 }
 
 HRESULT DirectShowPin::QueryAccept(const AM_MEDIA_TYPE *pmt)
@@ -309,12 +299,10 @@ HRESULT DirectShowPin::QueryAccept(const AM_MEDIA_TYPE *pmt)
 
 HRESULT DirectShowPin::EnumMediaTypes(IEnumMediaTypes **ppEnum)
 {
-    if (!ppEnum) {
+    if (!ppEnum)
         return E_POINTER;
-    } else {
-        *ppEnum = new DirectShowMediaTypeEnum(this);
-        return S_OK;
-    }
+    *ppEnum = new DirectShowMediaTypeEnum(this);
+    return S_OK;
 }
 
 HRESULT DirectShowPin::QueryInternalConnections(IPin **apPin, ULONG *nPin)
@@ -349,12 +337,10 @@ HRESULT DirectShowPin::NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, d
 
 HRESULT DirectShowPin::QueryDirection(PIN_DIRECTION *pPinDir)
 {
-    if (!pPinDir) {
+    if (!pPinDir)
         return E_POINTER;
-    } else {
-        *pPinDir = m_direction;
-        return S_OK;
-    }
+    *pPinDir = m_direction;
+    return S_OK;
 }
 
 QList<DirectShowMediaType> DirectShowPin::supportedMediaTypes()