slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make QDeclarativeAudio use QMediaPlayer instead of the controls.

Browse Source 
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>
This commit is contained in:
Michael Goddard
2012-03-13 13:29:26 +10:00
committed by Qt by Nokia
parent 7c0b1da0ed
commit e9ebbeef72
11 changed files with 338 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
View File

@@ -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()

2
tests/auto/unit/qdeclarativeaudio_4/qdeclarativeaudio_4.pro
View File

@@ -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 \

2
tests/auto/unit/qdeclarativeaudio_4/tst_qdeclarativeaudio_4.cpp
View File

@@ -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>