diff options
| author | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-07-08 12:47:41 (GMT) |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-07-08 12:47:41 (GMT) |
| commit | ab2b51679c64fd1befad9e8a3442bff2bb104a19 (patch) | |
| tree | f4d1a4d090d12f587d3e62a8f793c6e2ff54e823 /src/3rdparty | |
| parent | 0ed214105547980803336337096fd9429ce9f1a1 (diff) | |
| parent | 1dd1cb8c70a8986c1acc911a663d99d7043d15c7 (diff) | |
| download | Qt-ab2b51679c64fd1befad9e8a3442bff2bb104a19.zip Qt-ab2b51679c64fd1befad9e8a3442bff2bb104a19.tar.gz Qt-ab2b51679c64fd1befad9e8a3442bff2bb104a19.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/ds9/mediaobject.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp index 1d0b69d..f77bdc1 100644 --- a/src/3rdparty/phonon/ds9/mediaobject.cpp +++ b/src/3rdparty/phonon/ds9/mediaobject.cpp @@ -207,12 +207,14 @@ namespace Phonon HRESULT hr = S_OK; - m_currentRender = w.graph; - m_currentRenderId = w.id; - if (w.task == ReplaceGraph) { + { QMutexLocker locker(&m_mutex); - HANDLE h; + m_currentRender = w.graph; + m_currentRenderId = w.id; + } + if (w.task == ReplaceGraph) { + QMutexLocker locker(&m_mutex); int index = -1; for(int i = 0; i < FILTER_COUNT; ++i) { if (m_graphHandle[i].graph == w.oldGraph) { @@ -228,6 +230,7 @@ namespace Phonon Q_ASSERT(index != -1); //add the new graph + HANDLE h; if (SUCCEEDED(ComPointer<IMediaEvent>(w.graph, IID_IMediaEvent) ->GetEventHandle(reinterpret_cast<OAEVENT*>(&h)))) { m_graphHandle[index].graph = w.graph; @@ -324,8 +327,11 @@ namespace Phonon } } - m_currentRender = Graph(); - m_currentRenderId = 0; + { + QMutexLocker locker(&m_mutex); + m_currentRender = Graph(); + m_currentRenderId = 0; + } } |