diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-03-13 13:29:26 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-16 06:58:46 +0100 |
| commit | e9ebbeef72b6fd0ed375cae0b35b7a879c6fe9b5 (patch) | |
| tree | 1f83f5980fe0ea3e5b85e65fc8f2ce51350de03e /tests | |
| parent | 7c0b1da0edec1228657ab06ab3eb2e6c529b84bd (diff) | |
Make QDeclarativeAudio use QMediaPlayer instead of the controls.
Very minor changes in semantics due to previous differences:
* negative positions are not supported any more (clamped to >= 0)
* setting muted to the same value previously set to the control itself
won't signal any more.
Change-Id: Iacf4310508d853ae82b63dee28095fce12b6ff28
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'tests')
3 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index 57f0dd10a..0b358d711 100644 --- a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp +++ b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp @@ -617,18 +617,18 @@ void tst_QDeclarativeAudio::position() QCOMPARE(spy.count(), 1); audio.setPosition(-5403); - QCOMPARE(audio.position(), -5403); - QCOMPARE(provider.playerControl()->position(), qint64(-5403)); + QCOMPARE(audio.position(), 0); + QCOMPARE(provider.playerControl()->position(), qint64(0)); QCOMPARE(spy.count(), 2); audio.setPosition(-5403); - QCOMPARE(audio.position(), -5403); - QCOMPARE(provider.playerControl()->position(), qint64(-5403)); + QCOMPARE(audio.position(), 0); + QCOMPARE(provider.playerControl()->position(), qint64(0)); QCOMPARE(spy.count(), 2); // Check the signal change signal is emitted if the change originates from the media service. - provider.playerControl()->setPosition(0); - QCOMPARE(audio.position(), 0); + provider.playerControl()->setPosition(450); + QCOMPARE(audio.position(), 450); QCOMPARE(spy.count(), 3); connect(&audio, SIGNAL(positionChanged()), &QTestEventLoop::instance(), SLOT(exitLoop())); @@ -691,7 +691,7 @@ void tst_QDeclarativeAudio::muted() audio.setMuted(false); QCOMPARE(audio.isMuted(), false); QCOMPARE(provider.playerControl()->isMuted(), false); - QCOMPARE(spy.count(), 3); + QCOMPARE(spy.count(), 2); } void tst_QDeclarativeAudio::bufferProgress() diff --git a/tests/auto/unit/qdeclarativeaudio_4/qdeclarativeaudio_4.pro b/tests/auto/unit/qdeclarativeaudio_4/qdeclarativeaudio_4.pro index d045ba032..a5566d7e9 100644 --- a/tests/auto/unit/qdeclarativeaudio_4/qdeclarativeaudio_4.pro +++ b/tests/auto/unit/qdeclarativeaudio_4/qdeclarativeaudio_4.pro @@ -7,7 +7,7 @@ CONFIG += no_private_qt_headers_warning HEADERS += \ $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio_p_4.h \ $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase_p_4.h \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediametadata_p.h + $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediametadata_p_4.h SOURCES += \ tst_qdeclarativeaudio_4.cpp \ diff --git a/tests/auto/unit/qdeclarativeaudio_4/tst_qdeclarativeaudio_4.cpp b/tests/auto/unit/qdeclarativeaudio_4/tst_qdeclarativeaudio_4.cpp index 6737fd9ea..c7c238ae7 100644 --- a/tests/auto/unit/qdeclarativeaudio_4/tst_qdeclarativeaudio_4.cpp +++ b/tests/auto/unit/qdeclarativeaudio_4/tst_qdeclarativeaudio_4.cpp @@ -44,7 +44,7 @@ #include <QtTest/QtTest> #include "qdeclarativeaudio_p_4.h" -#include "qdeclarativemediametadata_p.h" +#include "qdeclarativemediametadata_p_4.h" #include <qmediaplayercontrol.h> #include <qmediaservice.h> |