diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2012-03-02 00:21:04 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-02 09:30:34 +0100 |
commit | 2a8463711c7fd683ddf46f716bfff47c1603e863 (patch) | |
tree | 88a504ca27afe1891cce66f678cee5be9cba7993 /src/multimedia/qmediaobject.h | |
parent | d1b6bf5fac54a39d911079ba792ca95424c5c70c (diff) |
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 <ling.hu@nokia.com>
Diffstat (limited to 'src/multimedia/qmediaobject.h')
-rw-r--r-- | src/multimedia/qmediaobject.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/multimedia/qmediaobject.h b/src/multimedia/qmediaobject.h index f1805da17..3c67dd69f 100644 --- a/src/multimedia/qmediaobject.h +++ b/src/multimedia/qmediaobject.h @@ -90,6 +90,7 @@ Q_SIGNALS: void metaDataChanged(const QString &key, const QVariant &value); void availabilityChanged(bool available); + void availabilityErrorChanged(QtMultimedia::AvailabilityError error); protected: QMediaObject(QObject *parent, QMediaService *service); @@ -101,10 +102,11 @@ protected: QMediaObjectPrivate *d_ptr; private: - void setupMetaData(); + void setupControls(); Q_DECLARE_PRIVATE(QMediaObject) Q_PRIVATE_SLOT(d_func(), void _q_notify()) + Q_PRIVATE_SLOT(d_func(), void _q_availabilityChanged()) }; |