diff options
Diffstat (limited to 'src/imports/multimedia/qdeclarativeradiodata.cpp')
-rw-r--r-- | src/imports/multimedia/qdeclarativeradiodata.cpp | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/src/imports/multimedia/qdeclarativeradiodata.cpp b/src/imports/multimedia/qdeclarativeradiodata.cpp index ccc36629e..530601011 100644 --- a/src/imports/multimedia/qdeclarativeradiodata.cpp +++ b/src/imports/multimedia/qdeclarativeradiodata.cpp @@ -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 |