summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/ds9/mediaobject.h
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-08-11 11:16:51 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-08-11 11:19:01 (GMT)
commit507c0ff17beeddfd281a4e978c2612031ce49154 (patch)
tree9d65bff0ccaa31256f6679e84b332859b9bf160b /src/3rdparty/phonon/ds9/mediaobject.h
parent72ce054c0f5ed1691ad4056f03e240b69a39e8c7 (diff)
downloadQt-507c0ff17beeddfd281a4e978c2612031ce49154.zip
Qt-507c0ff17beeddfd281a4e978c2612031ce49154.tar.gz
Qt-507c0ff17beeddfd281a4e978c2612031ce49154.tar.bz2
Phonon: improve locking to make it safer to load a source
Task-number: 259482
Diffstat (limited to 'src/3rdparty/phonon/ds9/mediaobject.h')
-rw-r--r--src/3rdparty/phonon/ds9/mediaobject.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/ds9/mediaobject.h b/src/3rdparty/phonon/ds9/mediaobject.h
index fe52604..a6beb5f 100644
--- a/src/3rdparty/phonon/ds9/mediaobject.h
+++ b/src/3rdparty/phonon/ds9/mediaobject.h
@@ -143,7 +143,8 @@ namespace Phonon
bool m_finished;
quint16 m_currentWorkId;
QWinWaitCondition m_waitCondition;
- QMutex m_mutex;
+ QMutex m_mutex; // mutex for the m_queue, m_finished and m_currentWorkId
+ QMutex m_currentMutex; //mutex for current renderer and id
//this is for WaitForMultipleObjects
struct