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

Expose availability from the backend to C++ and QML.

Browse Source 
The availabilityError property was static based on the service, but it
can change at run time, so add the plumbing to allow the backend to
report it itself.

Also make sure that both QML and C++ expose the availability.

The radio tuner and data controls previously had properties (but no
signals) for availability - these have been removed.

Change-Id: I9240cf93e2a51b14cd38642f9312ae3c75f05361
Reviewed-by: Ling Hu <ling.hu@nokia.com>
This commit is contained in:
Michael Goddard
2012-03-02 00:21:04 +10:00
committed by Qt by Nokia
parent d1b6bf5fac
commit 2a8463711c
41 changed files with 763 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/unit/qmediaobject/qmediaobject.pro
View File

@@ -3,5 +3,6 @@ TARGET = tst_qmediaobject
QT += multimedia-private testlib
include (../qmultimedia_common/mockrecorder.pri)
include (../qmultimedia_common/mock.pri)
SOURCES += tst_qmediaobject.cpp

80
tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
View File

@@ -53,12 +53,17 @@
#include "mockmediarecorderservice.h"
#include "mockmediaserviceprovider.h"
#include "mockmetadatareadercontrol.h"
#include "mockavailabilitycontrol.h"
class QtTestMetaDataService : public QMediaService
class QtTestMediaObjectService : public QMediaService
{
Q_OBJECT
public:
QtTestMetaDataService(QObject *parent = 0):QMediaService(parent), metaDataRef(0), hasMetaData(true)
QtTestMediaObjectService(QObject *parent = 0, MockAvailabilityControl *availability = 0)
: QMediaService(parent)
, availabilityControl(availability)
, metaDataRef(0)
, hasMetaData(true)
{
}
@@ -66,6 +71,8 @@ public:
{
if (hasMetaData && qstrcmp(iid, QMetaDataReaderControl_iid) == 0)
return &metaData;
else if (qstrcmp(iid, QMediaAvailabilityControl_iid) == 0)
return availabilityControl;
else
return 0;
}
@@ -75,6 +82,7 @@ public:
}
MockMetaDataReaderControl metaData;
MockAvailabilityControl *availabilityControl;
int metaDataRef;
bool hasMetaData;
};
@@ -329,7 +337,7 @@ void tst_QMediaObject::nullMetaDataControl()
const QString titleKey(QLatin1String("Title"));
const QString title(QLatin1String("Host of Seraphim"));
QtTestMetaDataService service;
QtTestMediaObjectService service;
service.hasMetaData = false;
QtTestMediaObject object(&service);
@@ -345,7 +353,7 @@ void tst_QMediaObject::nullMetaDataControl()
void tst_QMediaObject::isMetaDataAvailable()
{
QtTestMetaDataService service;
QtTestMediaObjectService service;
service.metaData.setMetaDataAvailable(false);
QtTestMediaObject object(&service);
@@ -367,7 +375,7 @@ void tst_QMediaObject::isMetaDataAvailable()
void tst_QMediaObject::metaDataChanged()
{
QtTestMetaDataService service;
QtTestMediaObjectService service;
QtTestMediaObject object(&service);
QSignalSpy changedSpy(&object, SIGNAL(metaDataChanged()));
@@ -408,7 +416,7 @@ void tst_QMediaObject::metaData()
QFETCH(QString, title);
QFETCH(QString, genre);
QtTestMetaDataService service;
QtTestMediaObjectService service;
service.metaData.populateMetaData();
QtTestMediaObject object(&service);
@@ -430,20 +438,64 @@ void tst_QMediaObject::metaData()
void tst_QMediaObject::availability()
{
QtTestMediaObject nullObject(0);
QCOMPARE(nullObject.isAvailable(), false);
QCOMPARE(nullObject.availabilityError(), QtMultimedia::ServiceMissingError);
{
QtTestMediaObject nullObject(0);
QCOMPARE(nullObject.isAvailable(), false);
QCOMPARE(nullObject.availabilityError(), QtMultimedia::ServiceMissingError);
}
QtTestMetaDataService service;
QtTestMediaObject object(&service);
QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
{
QtTestMediaObjectService service;
QtTestMediaObject object(&service);
QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
}
{
MockAvailabilityControl available(QtMultimedia::NoError);
QtTestMediaObjectService service(0, &available);
QtTestMediaObject object(&service);
QSignalSpy availabilitySpy(&object, SIGNAL(availabilityChanged(bool)));
QSignalSpy availabilityErrorSpy(&object, SIGNAL(availabilityChanged(bool)));
QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
available.setAvailability(QtMultimedia::BusyError);
QCOMPARE(object.isAvailable(), false);
QCOMPARE(object.availabilityError(), QtMultimedia::BusyError);
QCOMPARE(availabilitySpy.count(), 1);
QCOMPARE(availabilityErrorSpy.count(), 1);
available.setAvailability(QtMultimedia::NoError);
QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
QCOMPARE(availabilitySpy.count(), 2);
QCOMPARE(availabilityErrorSpy.count(), 2);
}
{
MockAvailabilityControl available(QtMultimedia::BusyError);
QtTestMediaObjectService service(0, &available);
QtTestMediaObject object(&service);
QSignalSpy availabilitySpy(&object, SIGNAL(availabilityChanged(bool)));
QSignalSpy availabilityErrorSpy(&object, SIGNAL(availabilityChanged(bool)));
QCOMPARE(object.isAvailable(), false);
QCOMPARE(object.availabilityError(), QtMultimedia::BusyError);
available.setAvailability(QtMultimedia::NoError);
QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
QCOMPARE(availabilitySpy.count(), 1);
QCOMPARE(availabilityErrorSpy.count(), 1);
}
}
void tst_QMediaObject::service()
{
// Create the mediaobject with service.
QtTestMetaDataService service;
QtTestMediaObjectService service;
QtTestMediaObject mediaObject1(&service);
// Get service and Compare if it equal to the service passed as an argument in mediaObject1.