diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-25 10:53:26 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 02:47:41 +0200 |
| commit | b0809c027c9fe2e49d37dff45aa4f03b0a4e0743 (patch) | |
| tree | d647951ecb69c9b39f004198d76fbc4972174549 /src/plugins/gstreamer/mediaplayer | |
| parent | bba28afe559837321a2083b3ce046ab774a7ef6b (diff) | |
Rename availabilityError to availability.
It's perhaps clearer in the usual case.
Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/plugins/gstreamer/mediaplayer')
| -rw-r--r-- | src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.cpp b/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.cpp index 96cdf0512..fa6284f71 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.cpp @@ -58,9 +58,9 @@ void QGStreamerAvailabilityControl::handleAvailabilityChanged() emit availabilityChanged(this->availability()); } -QtMultimedia::AvailabilityError QGStreamerAvailabilityControl::availability() const +QtMultimedia::AvailabilityStatus QGStreamerAvailabilityControl::availability() const { - return m_resources->isAvailable() ? QtMultimedia::NoError : QtMultimedia::BusyError; + return m_resources->isAvailable() ? QtMultimedia::Available : QtMultimedia::Busy; } QT_END_NAMESPACE diff --git a/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.h b/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.h index 36959559d..786ea16a5 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.h @@ -53,7 +53,7 @@ class QGStreamerAvailabilityControl : public QMediaAvailabilityControl Q_OBJECT public: QGStreamerAvailabilityControl(QMediaPlayerResourceSetInterface *resources, QObject *parent = 0); - QtMultimedia::AvailabilityError availability() const; + QtMultimedia::AvailabilityStatus availability() const; private Q_SLOTS: void handleAvailabilityChanged(); |