diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-08-11 13:45:27 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-08-12 08:40:44 (GMT) |
| commit | 62aa09a47cc226518d42f1b3b2337fdcb440da33 (patch) | |
| tree | 213b25a5218c1078f7426c06960f1e3f17f737c1 | |
| parent | bdc6badde26d7543618561b51c4f76dec24e66f3 (diff) | |
| download | Qt-62aa09a47cc226518d42f1b3b2337fdcb440da33.zip Qt-62aa09a47cc226518d42f1b3b2337fdcb440da33.tar.gz Qt-62aa09a47cc226518d42f1b3b2337fdcb440da33.tar.bz2 | |
Phonon: On windows, cross fading was broken
| -rw-r--r-- | src/3rdparty/phonon/ds9/mediaobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp index 22f1527..de2078a 100644 --- a/src/3rdparty/phonon/ds9/mediaobject.cpp +++ b/src/3rdparty/phonon/ds9/mediaobject.cpp @@ -512,7 +512,8 @@ namespace Phonon qSwap(m_graphs[0], m_graphs[1]); //swap the graphs - m_graphs[1]->stop(); //make sure we stop the previous graph + if (m_transitionTime >= 0) + m_graphs[1]->stop(); //make sure we stop the previous graph if (currentGraph()->mediaSource().type() != Phonon::MediaSource::Invalid && catchComError(currentGraph()->renderResult())) { |