diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-09-29 08:40:42 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-09-29 15:44:42 (GMT) |
| commit | a9ea6e24db0e25ec8c84c9a29356aac999421d07 (patch) | |
| tree | 04cc7cb1206268282f1eecc52425bef0cad0f6b1 /tests/auto/mediaobject | |
| parent | 17c17adbd706d32723ecedeb207c7e467f9fa8eb (diff) | |
| download | Qt-a9ea6e24db0e25ec8c84c9a29356aac999421d07.zip Qt-a9ea6e24db0e25ec8c84c9a29356aac999421d07.tar.gz Qt-a9ea6e24db0e25ec8c84c9a29356aac999421d07.tar.bz2 | |
Changes for fixing media object.
This brings tst_MediaObject to 15/7, from previously not running. Changes
involves:
* Skipping .qrc related tests
* Loading/mimetype detction from file:/ URIs
* State fixes
* As part of previous point, move state and error handling down in
AbstractPlayer.
Diffstat (limited to 'tests/auto/mediaobject')
| -rw-r--r-- | tests/auto/mediaobject/tst_mediaobject.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index 556e465..16b2611 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -89,7 +89,7 @@ const qint64 SEEK_BACKWARDS = 2000; const qint64 ALLOWED_TIME_FOR_SEEKING = 1500; // 1.5s const qint64 SEEKING_TOLERANCE = 250; #else -#if defined(Q_OS_WIN) || defined(Q_OS_MAC) +#if defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(Q_OS_SYMBIAN) #define MEDIA_FILE "/sax.mp3" #define MEDIA_FILEPATH ":/media/sax.mp3" #else @@ -207,6 +207,11 @@ void tst_MediaObject::stateChanged(Phonon::State newstate, Phonon::State oldstat void tst_MediaObject::testPlayFromResource() { +#ifdef Q_OS_SYMBIAN + QSKIP("Not implemented yet.", SkipAll); + return; +#endif + QFile file(MEDIA_FILEPATH); MediaObject media; media.setCurrentSource(&file); |