Phonon on windows: fixeda possible dead-lock when using QFile

the msdn was not correct and IAsyncReader::WaitForNext should not
return an error when the pin is currently flushing.
I took the opportunity to clean the way the mutex is locked on the
pin.

Task-number: 258830

1 files changed, 6 insertions, 6 deletions

diff --git a/src/3rdparty/phonon/ds9/qmeminputpin.cpp b/src/3rdparty/phonon/ds9/qmeminputpin.cpp
index 865b8af..630cfb4 100644
--- a/src/3rdparty/phonon/ds9/qmeminputpin.cpp
+++ b/src/3rdparty/phonon/ds9/qmeminputpin.cpp
@@ -84,7 +84,7 @@ namespace Phonon
                     conn->BeginFlush();
                 }
             }
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             m_flushing = true;
             return S_OK;
         }
@@ -98,7 +98,7 @@ namespace Phonon
                     conn->EndFlush();
                 }
             }
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             m_flushing = false;
             return S_OK;
         }
@@ -152,7 +152,7 @@ namespace Phonon
             }
 
             {
-                QWriteLocker locker(&m_lock);
+                QMutexLocker locker(&m_mutex);
                 m_shouldDuplicateSamples = m_transform && readonly;
             }
 
@@ -266,19 +266,19 @@ namespace Phonon
 
         void QMemInputPin::addOutput(QPin *output)
         {
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             m_outputs += output;
         }
 
         void QMemInputPin::removeOutput(QPin *output)
         {
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             m_outputs.removeOne(output);
         }
 
         QList<QPin*> QMemInputPin::outputs() const
         {
-            QReadLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             return m_outputs;
         }