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

36
src/multimedia/qmediaobject.cpp
View File

@@ -47,7 +47,7 @@
#include <qmediaservice.h>
#include <qmetadatareadercontrol.h>
#include <qmediabindableinterface.h>
#include <qmediaavailabilitycontrol.h>
QT_BEGIN_NAMESPACE
@@ -64,6 +64,17 @@ void QMediaObjectPrivate::_q_notify()
}
}
void QMediaObjectPrivate::_q_availabilityChanged()
{
Q_Q(QMediaObject);
// Really this should not always emit, but
// we can't really tell from here (isAvailable
// may not have changed, or the mediaobject's overridden
// availabilityError() may not have changed).
q->availabilityErrorChanged(q->availabilityError());
q->availabilityChanged(q->isAvailable());
}
/*!
\class QMediaObject
@@ -104,7 +115,13 @@ QMediaObject::~QMediaObject()
QtMultimedia::AvailabilityError QMediaObject::availabilityError() const
{
return d_func()->service == 0 ? QtMultimedia::ServiceMissingError : QtMultimedia::NoError;
if (d_func()->service == 0)
return QtMultimedia::ServiceMissingError;
if (d_func()->availabilityControl)
return d_func()->availabilityControl->availability();
return QtMultimedia::NoError;
}
/*!
@@ -113,7 +130,7 @@ QtMultimedia::AvailabilityError QMediaObject::availabilityError() const
bool QMediaObject::isAvailable() const
{
return d_func()->service != 0;
return availabilityError() == QtMultimedia::NoError;
}
/*!
@@ -216,7 +233,7 @@ QMediaObject::QMediaObject(QObject *parent, QMediaService *service):
d->service = service;
setupMetaData();
setupControls();
}
/*!
@@ -237,7 +254,7 @@ QMediaObject::QMediaObject(QMediaObjectPrivate &dd, QObject *parent,
d->service = service;
setupMetaData();
setupControls();
}
/*!
@@ -360,7 +377,7 @@ QStringList QMediaObject::availableMetaData() const
*/
void QMediaObject::setupMetaData()
void QMediaObject::setupControls()
{
Q_D(QMediaObject);
@@ -377,6 +394,13 @@ void QMediaObject::setupMetaData()
SIGNAL(metaDataAvailableChanged(bool)),
SIGNAL(metaDataAvailableChanged(bool)));
}
d->availabilityControl = d->service->requestControl<QMediaAvailabilityControl*>();
if (d->availabilityControl) {
connect(d->availabilityControl,
SIGNAL(availabilityChanged(QtMultimedia::AvailabilityError)),
SLOT(_q_availabilityChanged()));
}
}
}