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

4
src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.cpp
View File

@@ -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

2
src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.h
View File

@@ -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();

4
src/plugins/v4l/radio/v4lradiocontrol.cpp
View File

@@ -88,10 +88,10 @@ bool V4LRadioControl::isAvailable() const
return available;
}
QtMultimedia::AvailabilityError V4LRadioControl::availabilityError() const
QtMultimedia::AvailabilityStatus V4LRadioControl::availability() const
{
if (fd > 0)
return QtMultimedia::NoError;
return QtMultimedia::Available;
else
return QtMultimedia::ResourceError;
}

2
src/plugins/v4l/radio/v4lradiocontrol.h
View File

@@ -65,7 +65,7 @@ public:
~V4LRadioControl();
bool isAvailable() const;
QtMultimedia::AvailabilityError availabilityError() const;
QtMultimedia::AvailabilityStatus availability() const;
QRadioTuner::State state() const;