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

35
src/imports/multimedia/qdeclarativeradiodata.cpp
View File

@@ -112,6 +112,9 @@ QDeclarativeRadioData::QDeclarativeRadioData(QObject *parent) :
connect(m_radioData, SIGNAL(alternativeFrequenciesEnabledChanged(bool)), this,
SIGNAL(alternativeFrequenciesEnabledChanged(bool)));
// Note we map availabilityError->availability
connect(m_radioData, SIGNAL(availabilityErrorChanged(QtMultimedia::AvailabilityError)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityError)));
connect(m_radioData, SIGNAL(error(QRadioData::Error)), this, SLOT(_q_error(QRadioData::Error)));
}
@@ -120,15 +123,32 @@ QDeclarativeRadioData::~QDeclarativeRadioData()
}
/*!
\qmlmethod bool QtMultimedia5::RadioData::isAvailable()
\qmlproperty enumeration QtMultimedia5::RadioData::availability
Returns whether the radio data element is ready to use.
*/
bool QDeclarativeRadioData::isAvailable() const
Returns the availability state of the radio data interface.
This is one of:
\table
\header \li Value \li Description
\row \li Available
\li The radio data interface is available to use
\row \li Busy
\li The radio data interface is usually available to use, but is currently busy.
\row \li Unavailable
\li The radio data interface is not available to use (there may be no radio
hardware)
\row \li ResourceMissing
\li There is one or more resources missing, so the radio cannot
be used. It may be possible to try again at a later time.
\endtable
*/
QDeclarativeRadioData::Availability QDeclarativeRadioData::availability() const
{
return m_radioData->isAvailable();
return Availability(m_radioData->availabilityError());
}
/*!
\qmlproperty string QtMultimedia5::RadioData::stationId
@@ -265,4 +285,9 @@ void QDeclarativeRadioData::_q_error(QRadioData::Error errorCode)
emit errorChanged();
}
void QDeclarativeRadioData::_q_availabilityChanged(QtMultimedia::AvailabilityError error)
{
emit availabilityChanged(Availability(error));
}
QT_END_NAMESPACE