slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename availabilityError to availability.

Browse Source 
It's perhaps clearer in the usual case.

Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96
Reviewed-by: Ling Hu <ling.hu@nokia.com>
This commit is contained in:
Michael Goddard
2012-06-25 10:53:26 +10:00
committed by Qt by Nokia
parent bba28afe55
commit b0809c027c
44 changed files with 167 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/multimedia/playback/qmediaplayer.cpp
View File

@@ -84,7 +84,7 @@ QT_BEGIN_NAMESPACE
\list
\li Accessing the currently playing media's metadata (\l {QMediaObject::metaData()} and \l {QtMultimedia::MetaData}{predefined meta-data keys})
\li Checking to see if the media playback service is currently available (\l {QMediaObject::availabilityError()})
\li Checking to see if the media playback service is currently available (\l {QMediaObject::availability()})
\endlist
\sa QMediaObject, QMediaService, QVideoWidget, QMediaPlaylist
@@ -1013,14 +1013,14 @@ void QMediaPlayer::setVideoOutput(QAbstractVideoSurface *surface)
}
/*! \reimp */
QtMultimedia::AvailabilityError QMediaPlayer::availabilityError() const
QtMultimedia::AvailabilityStatus QMediaPlayer::availability() const
{
Q_D(const QMediaPlayer);
if (!d->control)
return QtMultimedia::ServiceMissingError;
return QtMultimedia::ServiceMissing;
return QMediaObject::availabilityError();
return QMediaObject::availability();
}

2
src/multimedia/playback/qmediaplayer.h
View File

@@ -161,7 +161,7 @@ public:
QNetworkConfiguration currentNetworkConfiguration() const;
QtMultimedia::AvailabilityError availabilityError() const;
QtMultimedia::AvailabilityStatus availability() const;
public Q_SLOTS:
void play();