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/imports/multimedia/qdeclarativeaudio.cpp | |
| 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/imports/multimedia/qdeclarativeaudio.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index aaf43febd..e9fda4f5a 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -99,7 +99,7 @@ void QDeclarativeAudio::_q_error(QMediaPlayer::Error errorCode) emit errorChanged(); } -void QDeclarativeAudio::_q_availabilityChanged(QtMultimedia::AvailabilityError) +void QDeclarativeAudio::_q_availabilityChanged(QtMultimedia::AvailabilityStatus) { emit availabilityChanged(availability()); } @@ -153,7 +153,7 @@ QDeclarativeAudio::Availability QDeclarativeAudio::availability() const { if (!m_player) return Unavailable; - return Availability(m_player->availabilityError()); + return Availability(m_player->availability()); } QUrl QDeclarativeAudio::source() const @@ -658,10 +658,10 @@ void QDeclarativeAudio::classBegin() connect(m_player, SIGNAL(videoAvailableChanged(bool)), this, SIGNAL(hasVideoChanged())); - m_error = m_player->availabilityError() == QtMultimedia::ServiceMissingError ? QMediaPlayer::ServiceMissingError : QMediaPlayer::NoError; + m_error = m_player->availability() == QtMultimedia::ServiceMissing ? QMediaPlayer::ServiceMissingError : QMediaPlayer::NoError; - connect(m_player, SIGNAL(availabilityErrorChanged(QtMultimedia::AvailabilityError)), - this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityError))); + connect(m_player, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), + this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); m_metaData.reset(new QDeclarativeMediaMetaData(m_player)); |