summaryrefslogtreecommitdiffstats
path: root/tests/auto/mediaobject
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-04-14 15:03:50 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-04-15 05:40:05 (GMT)
commit7e598398ec161e3fc5df98ea754bd637d0c1ba30 (patch)
treed245106e3cb07d7f13ed1a72f02ee23313b0ee32 /tests/auto/mediaobject
parent4f97cf29e5be9f34341dd99ad4bd8dd3d61b1441 (diff)
downloadQt-7e598398ec161e3fc5df98ea754bd637d0c1ba30.zip
Qt-7e598398ec161e3fc5df98ea754bd637d0c1ba30.tar.gz
Qt-7e598398ec161e3fc5df98ea754bd637d0c1ba30.tar.bz2
Phonon MMF: calling pause() when in StoppedState triggers stateChanged()
Previously, the MMF backend simply swallowed a call to pause() when in StoppedState. However, the stopToPause step in tst_mediaobject requires the backend to emit a stateChanged signal when this happens. Reviewed-by: Frans Englich
Diffstat (limited to 'tests/auto/mediaobject')
-rw-r--r--tests/auto/mediaobject/tst_mediaobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp
index 127b775..994057b 100644
--- a/tests/auto/mediaobject/tst_mediaobject.cpp
+++ b/tests/auto/mediaobject/tst_mediaobject.cpp
@@ -575,7 +575,7 @@ void tst_MediaObject::playSDP()
// MediaObject should have loaded the SDP, but be in error state due to absent media
const bool stateMatch = (m_media->state() == Phonon::ErrorState);
- const bool errorStringMatch = (m_media->errorString() == QString::fromLatin1("Buffering clip failed: Unknown error (-39)"));
+ const bool errorStringMatch = (m_media->errorString() == QString::fromLatin1("Loading clip failed: Unknown error (-39)"));
// Ensure that m_media is back in ground state prior to starting next test step
m_media->setCurrentSource(oldSource);