From 2a8463711c7fd683ddf46f716bfff47c1603e863 Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Fri, 2 Mar 2012 00:21:04 +1000 Subject: Expose availability from the backend to C++ and QML. 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 --- src/imports/multimedia/qdeclarativeaudio_p.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/imports/multimedia/qdeclarativeaudio_p.h') diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h index 942832894..6d2497fac 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p.h +++ b/src/imports/multimedia/qdeclarativeaudio_p.h @@ -87,10 +87,12 @@ class QDeclarativeAudio : public QObject, public QDeclarativeMediaBase, public Q Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) Q_PROPERTY(QDeclarativeMediaMetaData *metaData READ metaData CONSTANT) Q_PROPERTY(QObject *mediaObject READ mediaObject NOTIFY mediaObjectChanged SCRIPTABLE false DESIGNABLE false) + Q_PROPERTY(Availability availability READ availability NOTIFY availabilityChanged) Q_ENUMS(Status) Q_ENUMS(Error) Q_ENUMS(Loop) Q_ENUMS(PlaybackState) + Q_ENUMS(Availability) Q_INTERFACES(QDeclarativeParserStatus) public: enum Status @@ -128,6 +130,13 @@ public: StoppedState = QMediaPlayer::StoppedState }; + enum Availability { + Available = QtMultimedia::NoError, + Busy = QtMultimedia::BusyError, + Unavailable = QtMultimedia::ServiceMissingError, + ResourceMissing = QtMultimedia::ResourceError + }; + QDeclarativeAudio(QObject *parent = 0); ~QDeclarativeAudio(); @@ -143,6 +152,8 @@ public: QObject *mediaObject() { return m_mediaObject; } + Availability availability() const; + public Q_SLOTS: void play(); void pause(); @@ -175,6 +186,8 @@ Q_SIGNALS: void seekableChanged(); void playbackRateChanged(); + void availabilityChanged(Availability availability); + void errorChanged(); void error(QDeclarativeAudio::Error error, const QString &errorString); @@ -182,6 +195,7 @@ Q_SIGNALS: private Q_SLOTS: void _q_error(int, const QString &); + void _q_availabilityChanged(QtMultimedia::AvailabilityError); private: Q_DISABLE_COPY(QDeclarativeAudio) -- cgit v1.2.3