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

2
doc/src/changes.qdoc
View File

@@ -106,7 +106,7 @@ they are documented elsewhere.
normal Qt namespace (usually nothing, unless built specially). There
was a Qt Multimedia Kit namespace for several enumerations. This namespace
has now changed to Qt Multimedia, so if you've used one of the
\c SupportEstimate, \c EncodingQuality, \c EncodingMode or \c AvailabilityError
\c SupportEstimate, \c EncodingQuality, \c EncodingMode or \c AvailabilityStatus
enumerations you'll need to change your code. In fact, running a global
search and replace on \c QtMultimediaKit (to replace it with \c QtMultimedia) will
go a long way with porting your code.

4
src/imports/multimedia/plugins.qmltypes
View File

@@ -1434,9 +1434,9 @@ Module {
Parameter { name: "available"; type: "bool" }
}
Signal {
name: "availabilityErrorChanged"
name: "availabilityChanged"
type: "void"
Parameter { name: "error"; type: "QtMultimedia::AvailabilityError" }
Parameter { name: "error"; type: "QtMultimedia::AvailabilityStatus" }
}
}
Component {

10
src/imports/multimedia/qdeclarativeaudio.cpp
View File

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

8
src/imports/multimedia/qdeclarativeaudio_p.h
View File

@@ -138,9 +138,9 @@ public:
};
enum Availability {
Available = QtMultimedia::NoError,
Busy = QtMultimedia::BusyError,
Unavailable = QtMultimedia::ServiceMissingError,
Available = QtMultimedia::Available,
Busy = QtMultimedia::Busy,
Unavailable = QtMultimedia::ServiceMissing,
ResourceMissing = QtMultimedia::ResourceError
};
@@ -237,7 +237,7 @@ Q_SIGNALS:
private Q_SLOTS:
void _q_error(QMediaPlayer::Error);
void _q_availabilityChanged(QtMultimedia::AvailabilityError);
void _q_availabilityChanged(QtMultimedia::AvailabilityStatus);
void _q_statusChanged();
private:

10
src/imports/multimedia/qdeclarativecamera.cpp
View File

@@ -68,9 +68,9 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state)
emit cameraStateChanged(QDeclarativeCamera::State(state));
}
void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityError error)
void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability)
{
emit availabilityChanged(Availability(error));
emit availabilityChanged(Availability(availability));
}
/*!
@@ -188,9 +188,7 @@ QDeclarativeCamera::QDeclarativeCamera(QObject *parent) :
connect(m_camera, SIGNAL(stateChanged(QCamera::State)), this, SLOT(_q_updateState(QCamera::State)));
connect(m_camera, SIGNAL(statusChanged(QCamera::Status)), this, SIGNAL(cameraStatusChanged()));
connect(m_camera, SIGNAL(error(QCamera::Error)), this, SLOT(_q_error(QCamera::Error)));
// Note we map availabilityError->availability
connect(m_camera, SIGNAL(availabilityErrorChanged(QtMultimedia::AvailabilityError)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityError)));
connect(m_camera, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus)));
connect(m_camera->focus(), SIGNAL(opticalZoomChanged(qreal)), this, SIGNAL(opticalZoomChanged(qreal)));
connect(m_camera->focus(), SIGNAL(digitalZoomChanged(qreal)), this, SIGNAL(digitalZoomChanged(qreal)));
@@ -260,7 +258,7 @@ QString QDeclarativeCamera::errorString() const
*/
QDeclarativeCamera::Availability QDeclarativeCamera::availability() const
{
return Availability(m_camera->availabilityError());
return Availability(m_camera->availability());
}

8
src/imports/multimedia/qdeclarativecamera_p.h
View File

@@ -216,9 +216,9 @@ public:
};
enum Availability {
Available = QtMultimedia::NoError,
Busy = QtMultimedia::BusyError,
Unavailable = QtMultimedia::ServiceMissingError,
Available = QtMultimedia::Available,
Busy = QtMultimedia::Busy,
Unavailable = QtMultimedia::ServiceMissing,
ResourceMissing = QtMultimedia::ResourceError
};
@@ -287,7 +287,7 @@ Q_SIGNALS:
private Q_SLOTS:
void _q_updateState(QCamera::State);
void _q_error(QCamera::Error);
void _q_availabilityChanged(QtMultimedia::AvailabilityError);
void _q_availabilityChanged(QtMultimedia::AvailabilityStatus);
protected:
void classBegin();

10
src/imports/multimedia/qdeclarativeradio.cpp
View File

@@ -115,9 +115,7 @@ QDeclarativeRadio::QDeclarativeRadio(QObject *parent) :
connect(m_radioTuner, SIGNAL(mutedChanged(bool)), this, SIGNAL(mutedChanged(bool)));
connect(m_radioTuner, SIGNAL(stationFound(int, QString)), this, SIGNAL(stationFound(int, QString)));
connect(m_radioTuner, SIGNAL(antennaConnectedChanged(bool)), this, SIGNAL(antennaConnectedChanged(bool)));
// Note we map availabilityError->availability
connect(m_radioTuner, SIGNAL(availabilityErrorChanged(QtMultimedia::AvailabilityError)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityError)));
connect(m_radioTuner, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus)));
connect(m_radioTuner, SIGNAL(error(QRadioTuner::Error)), this, SLOT(_q_error(QRadioTuner::Error)));
}
@@ -339,7 +337,7 @@ bool QDeclarativeRadio::isAntennaConnected() const
*/
QDeclarativeRadio::Availability QDeclarativeRadio::availability() const
{
return Availability(m_radioTuner->availabilityError());
return Availability(m_radioTuner->availability());
}
void QDeclarativeRadio::setBand(QDeclarativeRadio::Band band)
@@ -528,9 +526,9 @@ void QDeclarativeRadio::_q_error(QRadioTuner::Error errorCode)
emit errorChanged();
}
void QDeclarativeRadio::_q_availabilityChanged(QtMultimedia::AvailabilityError error)
void QDeclarativeRadio::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability)
{
emit availabilityChanged(Availability(error));
emit availabilityChanged(Availability(availability));
}
/*!

8
src/imports/multimedia/qdeclarativeradio_p.h
View File

@@ -120,9 +120,9 @@ public:
};
enum Availability {
Available = QtMultimedia::NoError,
Busy = QtMultimedia::BusyError,
Unavailable = QtMultimedia::ServiceMissingError,
Available = QtMultimedia::Available,
Busy = QtMultimedia::Busy,
Unavailable = QtMultimedia::ServiceMissing,
ResourceMissing = QtMultimedia::ResourceError
};
@@ -189,7 +189,7 @@ private Q_SLOTS:
void _q_stateChanged(QRadioTuner::State state);
void _q_bandChanged(QRadioTuner::Band band);
void _q_error(QRadioTuner::Error errorCode);
void _q_availabilityChanged(QtMultimedia::AvailabilityError);
void _q_availabilityChanged(QtMultimedia::AvailabilityStatus);
private:
Q_DISABLE_COPY(QDeclarativeRadio)

10
src/imports/multimedia/qdeclarativeradiodata.cpp
View File

@@ -141,7 +141,7 @@ QDeclarativeRadioData::~QDeclarativeRadioData()
*/
QDeclarativeRadioData::Availability QDeclarativeRadioData::availability() const
{
return Availability(m_radioData->availabilityError());
return Availability(m_radioData->availability());
}
@@ -281,9 +281,9 @@ void QDeclarativeRadioData::_q_error(QRadioData::Error errorCode)
emit errorChanged();
}
void QDeclarativeRadioData::_q_availabilityChanged(QtMultimedia::AvailabilityError error)
void QDeclarativeRadioData::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability)
{
emit availabilityChanged(Availability(error));
emit availabilityChanged(Availability(availability));
}
void QDeclarativeRadioData::connectSignals()
@@ -297,10 +297,8 @@ void QDeclarativeRadioData::connectSignals()
connect(m_radioData, SIGNAL(radioTextChanged(QString)), this, SIGNAL(radioTextChanged(QString)));
connect(m_radioData, SIGNAL(alternativeFrequenciesEnabledChanged(bool)), this,
SIGNAL(alternativeFrequenciesEnabledChanged(bool)));
// Note we map availabilityError->availability
// Since the radio data type depends on the service for the tuner, the availability is also dictated from the tuner
connect(m_radioTuner, SIGNAL(availabilityErrorChanged(QtMultimedia::AvailabilityError)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityError)));
connect(m_radioTuner, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus)));
connect(m_radioData, SIGNAL(error(QRadioData::Error)), this, SLOT(_q_error(QRadioData::Error)));
}

8
src/imports/multimedia/qdeclarativeradiodata_p.h
View File

@@ -137,9 +137,9 @@ public:
};
enum Availability {
Available = QtMultimedia::NoError,
Busy = QtMultimedia::BusyError,
Unavailable = QtMultimedia::ServiceMissingError,
Available = QtMultimedia::Available,
Busy = QtMultimedia::Busy,
Unavailable = QtMultimedia::ServiceMissing,
ResourceMissing = QtMultimedia::ResourceError
};
@@ -176,7 +176,7 @@ Q_SIGNALS:
private Q_SLOTS:
void _q_programTypeChanged(QRadioData::ProgramType programType);
void _q_error(QRadioData::Error errorCode);
void _q_availabilityChanged(QtMultimedia::AvailabilityError);
void _q_availabilityChanged(QtMultimedia::AvailabilityStatus);
private:
void connectSignals();

6
src/multimedia/camera/qcamera.cpp
View File

@@ -412,11 +412,11 @@ QCamera::~QCamera()
/*!
Returns the availability state of the camera service.
*/
QtMultimedia::AvailabilityError QCamera::availabilityError() const
QtMultimedia::AvailabilityStatus QCamera::availability() const
{
Q_D(const QCamera);
if (d->control == NULL)
return QtMultimedia::ServiceMissingError;
return QtMultimedia::ServiceMissing;
if (d->deviceControl && d->deviceControl->deviceCount() == 0)
return QtMultimedia::ResourceError;
@@ -424,7 +424,7 @@ QtMultimedia::AvailabilityError QCamera::availabilityError() const
if (d->error != QCamera::NoError)
return QtMultimedia::ResourceError;
return QMediaObject::availabilityError();
return QMediaObject::availability();
}

2
src/multimedia/camera/qcamera.h
View File

@@ -152,7 +152,7 @@ public:
static QList<QByteArray> availableDevices();
static QString deviceDescription(const QByteArray &device);
QtMultimedia::AvailabilityError availabilityError() const;
QtMultimedia::AvailabilityStatus availability() const;
State state() const;
Status status() const;

8
src/multimedia/camera/qcameraimagecapture.cpp
View File

@@ -312,14 +312,14 @@ bool QCameraImageCapture::isAvailable() const
}
/*!
Returns the availability error code.
Returns the availability of this functionality.
*/
QtMultimedia::AvailabilityError QCameraImageCapture::availabilityError() const
QtMultimedia::AvailabilityStatus QCameraImageCapture::availability() const
{
if (d_func()->control != NULL)
return QtMultimedia::NoError;
return QtMultimedia::Available;
else
return QtMultimedia::ServiceMissingError;
return QtMultimedia::ServiceMissing;
}
/*!

2
src/multimedia/camera/qcameraimagecapture.h
View File

@@ -97,7 +97,7 @@ public:
~QCameraImageCapture();
bool isAvailable() const;
QtMultimedia::AvailabilityError availabilityError() const;
QtMultimedia::AvailabilityStatus availability() const;
QMediaObject *mediaObject() const;

4
src/multimedia/controls/qmediaavailabilitycontrol.cpp
View File

@@ -90,7 +90,7 @@ QMediaAvailabilityControl::~QMediaAvailabilityControl()
/*!
\fn QtMultimedia::AvailabilityError QMediaAvailabilityControl::availability() const
\fn QtMultimedia::AvailabilityStatus QMediaAvailabilityControl::availability() const
Returns the current availability of this instance of the media service.
If the availability changes at run time (for example, some other media
@@ -100,7 +100,7 @@ QMediaAvailabilityControl::~QMediaAvailabilityControl()
/*!
\fn void QMediaAvailabilityControl::availabilityChanged(QtMultimedia::AvailabilityError availability)
\fn void QMediaAvailabilityControl::availabilityChanged(QtMultimedia::AvailabilityStatus availability)
Signal emitted when the current \a availability value changed.
*/

4
src/multimedia/controls/qmediaavailabilitycontrol.h
View File

@@ -62,10 +62,10 @@ class Q_MULTIMEDIA_EXPORT QMediaAvailabilityControl : public QMediaControl
public:
~QMediaAvailabilityControl();
virtual QtMultimedia::AvailabilityError availability() const = 0;
virtual QtMultimedia::AvailabilityStatus availability() const = 0;
signals:
void availabilityChanged(QtMultimedia::AvailabilityError availability);
void availabilityChanged(QtMultimedia::AvailabilityStatus availability);
protected:
QMediaAvailabilityControl(QObject* parent = 0);

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

27
src/multimedia/qmediaobject.cpp
View File

@@ -71,8 +71,8 @@ void QMediaObjectPrivate::_q_availabilityChanged()
// Really this should not always emit, but
// we can't really tell from here (isAvailable
// may not have changed, or the mediaobject's overridden
// availabilityError() may not have changed).
q->availabilityErrorChanged(q->availabilityError());
// availability() may not have changed).
q->availabilityChanged(q->availability());
q->availabilityChanged(q->isAvailable());
}
@@ -113,18 +113,23 @@ QMediaObject::~QMediaObject()
}
/*!
Returns the service availability error state.
Returns the availability of the functionality offered by this object.
In some cases the functionality may not be available (for example, if
the current operating system or platform does not provide the required
functionality), or it may be temporarily unavailable (for example,
audio playback during a phone call or similar).
*/
QtMultimedia::AvailabilityError QMediaObject::availabilityError() const
QtMultimedia::AvailabilityStatus QMediaObject::availability() const
{
if (d_func()->service == 0)
return QtMultimedia::ServiceMissingError;
return QtMultimedia::ServiceMissing;
if (d_func()->availabilityControl)
return d_func()->availabilityControl->availability();
return QtMultimedia::NoError;
return QtMultimedia::Available;
}
/*!
@@ -133,7 +138,7 @@ QtMultimedia::AvailabilityError QMediaObject::availabilityError() const
bool QMediaObject::isAvailable() const
{
return availabilityError() == QtMultimedia::NoError;
return availability() == QtMultimedia::Available;
}
/*!
@@ -403,7 +408,7 @@ void QMediaObject::setupControls()
d->availabilityControl = d->service->requestControl<QMediaAvailabilityControl*>();
if (d->availabilityControl) {
connect(d->availabilityControl,
SIGNAL(availabilityChanged(QtMultimedia::AvailabilityError)),
SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)),
SLOT(_q_availabilityChanged()));
}
}
@@ -412,13 +417,13 @@ void QMediaObject::setupControls()
/*!
\fn QMediaObject::availabilityChanged(bool available)
Signal emitted when the availability state has changed to \a available
Signal emitted when the availability state has changed to \a available.
*/
/*!
\fn QMediaObject::availabilityErrorChanged(QtMultimedia::AvailabilityError error)
\fn QMediaObject::availabilityChanged(QtMultimedia::AvailabilityStatus availability)
Signal emitted when the availability error has changed to \a error
Signal emitted when the availability of the service has changed to \a availabilty
*/

4
src/multimedia/qmediaobject.h
View File

@@ -67,7 +67,7 @@ public:
~QMediaObject();
virtual bool isAvailable() const;
virtual QtMultimedia::AvailabilityError availabilityError() const;
virtual QtMultimedia::AvailabilityStatus availability() const;
virtual QMediaService* service() const;
@@ -90,7 +90,7 @@ Q_SIGNALS:
void metaDataChanged(const QString &key, const QVariant &value);
void availabilityChanged(bool available);
void availabilityErrorChanged(QtMultimedia::AvailabilityError error);
void availabilityChanged(QtMultimedia::AvailabilityStatus availability);
protected:
QMediaObject(QObject *parent, QMediaService *service);

4
src/multimedia/qtmedianamespace.cpp
View File

@@ -49,7 +49,7 @@ namespace
public:
QMultimediaNamespacePrivateRegisterMetaTypes()
{
qRegisterMetaType<QtMultimedia::AvailabilityError>();
qRegisterMetaType<QtMultimedia::AvailabilityStatus>();
qRegisterMetaType<QtMultimedia::SupportEstimate>();
qRegisterMetaType<QtMultimedia::EncodingMode>();
qRegisterMetaType<QtMultimedia::EncodingQuality>();
@@ -400,7 +400,7 @@ Q_DEFINE_METADATA(ThumbnailImage);
*/
/*!
\enum QtMultimedia::AvailabilityError
\enum QtMultimedia::AvailabilityStatus
Enumerates Service status errors.

10
src/multimedia/qtmedianamespace.h
View File

@@ -314,11 +314,11 @@ namespace QtMultimedia
TwoPassEncoding
};
enum AvailabilityError
enum AvailabilityStatus
{
NoError,
ServiceMissingError,
BusyError,
Available,
ServiceMissing,
Busy,
ResourceError
};
@@ -328,7 +328,7 @@ namespace QtMultimedia
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QtMultimedia::AvailabilityError)
Q_DECLARE_METATYPE(QtMultimedia::AvailabilityStatus)
Q_DECLARE_METATYPE(QtMultimedia::SupportEstimate)
Q_DECLARE_METATYPE(QtMultimedia::EncodingMode)
Q_DECLARE_METATYPE(QtMultimedia::EncodingQuality)

12
src/multimedia/radio/qradiodata.cpp
View File

@@ -227,18 +227,18 @@ bool QRadioData::setMediaObject(QMediaObject *mediaObject)
/*!
Returns the availability of the radio data service.
A long as there is a media service which provides control, then the
\l{QtMultimedia::AvailabilityError}{availability error} will be that
of the \l{QRadioTuner::availabilityError()}{radio tuner}.
A long as there is a media service which provides radio functionality, then the
\l{QtMultimedia::AvailabilityStatus}{availability} will be that
of the \l{QRadioTuner::availability()}{radio tuner}.
*/
QtMultimedia::AvailabilityError QRadioData::availabilityError() const
QtMultimedia::AvailabilityStatus QRadioData::availability() const
{
Q_D(const QRadioData);
if (d->control == 0)
return QtMultimedia::ServiceMissingError;
return QtMultimedia::ServiceMissing;
return d->mediaObject->availabilityError();
return d->mediaObject->availability();
}
/*!

2
src/multimedia/radio/qradiodata.h
View File

@@ -91,7 +91,7 @@ public:
QRadioData(QMediaObject *mediaObject, QObject *parent = 0);
~QRadioData();
QtMultimedia::AvailabilityError availabilityError() const;
QtMultimedia::AvailabilityStatus availability() const;
QMediaObject *mediaObject() const;

6
src/multimedia/radio/qradiotuner.cpp
View File

@@ -159,15 +159,15 @@ QRadioTuner::~QRadioTuner()
/*!
Returns the availability of the radio tuner.
*/
QtMultimedia::AvailabilityError QRadioTuner::availabilityError() const
QtMultimedia::AvailabilityStatus QRadioTuner::availability() const
{
if (d_func()->control == 0)
return QtMultimedia::ServiceMissingError;
return QtMultimedia::ServiceMissing;
if (!d_func()->control->isAntennaConnected())
return QtMultimedia::ResourceError;
return QMediaObject::availabilityError();
return QMediaObject::availability();
}
/*!

2
src/multimedia/radio/qradiotuner.h
View File

@@ -87,7 +87,7 @@ public:
QRadioTuner(QObject *parent = 0);
~QRadioTuner();
QtMultimedia::AvailabilityError availabilityError() const;
QtMultimedia::AvailabilityStatus availability() const;
State state() const;

28
src/multimedia/recording/qmediarecorder.cpp
View File

@@ -185,7 +185,7 @@ void QMediaRecorderPrivate::_q_applySettings()
}
}
void QMediaRecorderPrivate::_q_availabilityChanged(QtMultimedia::AvailabilityError error)
void QMediaRecorderPrivate::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability)
{
Q_Q(QMediaRecorder);
Q_UNUSED(error);
@@ -193,8 +193,8 @@ void QMediaRecorderPrivate::_q_availabilityChanged(QtMultimedia::AvailabilityErr
// Really this should not always emit, but
// we can't really tell from here (isAvailable
// may not have changed, or the mediaobject's overridden
// availabilityError() may not have changed).
q->availabilityErrorChanged(q->availabilityError());
// availability() may not have changed).
q->availabilityChanged(q->availability());
q->availabilityChanged(q->isAvailable());
}
@@ -323,8 +323,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
service->releaseControl(d->metaDataControl);
}
if (d->availabilityControl) {
disconnect(d->availabilityControl, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityError)),
this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityError)));
disconnect(d->availabilityControl, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)),
this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus)));
service->releaseControl(d->availabilityControl);
}
}
@@ -375,8 +375,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
d->availabilityControl = service->requestControl<QMediaAvailabilityControl*>();
if (d->availabilityControl) {
connect(d->availabilityControl, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityError)),
this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityError)));
connect(d->availabilityControl, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)),
this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus)));
}
connect(d->control, SIGNAL(stateChanged(QMediaRecorder::State)),
@@ -442,23 +442,23 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
*/
bool QMediaRecorder::isAvailable() const
{
return availabilityError() == QtMultimedia::NoError;
return availability() == QtMultimedia::Available;
}
/*!
Returns the availability error code.
Returns the availability of this functionality.
\sa availabilityErrorChanged()
\sa availabilityChanged()
*/
QtMultimedia::AvailabilityError QMediaRecorder::availabilityError() const
QtMultimedia::AvailabilityStatus QMediaRecorder::availability() const
{
if (d_func()->control == NULL)
return QtMultimedia::ServiceMissingError;
return QtMultimedia::ServiceMissing;
if (d_func()->availabilityControl)
return d_func()->availabilityControl->availability();
return QtMultimedia::NoError;
return QtMultimedia::Available;
}
QUrl QMediaRecorder::outputLocation() const
@@ -960,7 +960,7 @@ void QMediaRecorder::stop()
*/
/*!
\fn QMediaRecorder::availabilityErrorChanged(QtMultimedia::AvailabilityError availability)
\fn QMediaRecorder::availabilityChanged(QtMultimedia::AvailabilityStatus availability)
Signals that the service availability has changed to \a availability.
*/

6
src/multimedia/recording/qmediarecorder.h
View File

@@ -117,7 +117,7 @@ public:
QMediaObject *mediaObject() const;
bool isAvailable() const;
QtMultimedia::AvailabilityError availabilityError() const;
QtMultimedia::AvailabilityStatus availability() const;
QUrl outputLocation() const;
bool setOutputLocation(const QUrl &location);
@@ -192,7 +192,7 @@ Q_SIGNALS:
void metaDataChanged(const QString &key, const QVariant &value);
void availabilityChanged(bool available);
void availabilityErrorChanged(QtMultimedia::AvailabilityError error);
void availabilityChanged(QtMultimedia::AvailabilityStatus availability);
protected:
QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = 0);
@@ -209,7 +209,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_updateActualLocation(const QUrl &))
Q_PRIVATE_SLOT(d_func(), void _q_updateNotifyInterval(int))
Q_PRIVATE_SLOT(d_func(), void _q_applySettings())
Q_PRIVATE_SLOT(d_func(), void _q_availabilityChanged(QtMultimedia::AvailabilityError))
Q_PRIVATE_SLOT(d_func(), void _q_availabilityChanged(QtMultimedia::AvailabilityStatus))
};
QT_END_NAMESPACE

2
src/multimedia/recording/qmediarecorder_p.h
View File

@@ -92,7 +92,7 @@ public:
void _q_notify();
void _q_updateNotifyInterval(int ms);
void _q_applySettings();
void _q_availabilityChanged(QtMultimedia::AvailabilityError error);
void _q_availabilityChanged(QtMultimedia::AvailabilityStatus availability);
QMediaRecorder *q_ptr;
};

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;

4
tests/auto/unit/qaudioprobe/tst_qaudioprobe.cpp
View File

@@ -104,7 +104,7 @@ void tst_QAudioProbe::testNullService()
recorder = new QAudioRecorder;
QVERIFY(!recorder->isAvailable());
QCOMPARE(recorder->availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(recorder->availability(), QtMultimedia::ServiceMissing);
QAudioProbe probe;
QVERIFY(!probe.isActive());
@@ -122,7 +122,7 @@ void tst_QAudioProbe::testNullControl()
recorder = new QAudioRecorder;
QVERIFY(!recorder->isAvailable());
QCOMPARE(recorder->availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(recorder->availability(), QtMultimedia::ServiceMissing);
QAudioProbe probe;
QVERIFY(!probe.isActive());

6
tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp
View File

@@ -106,7 +106,7 @@ void tst_QAudioRecorder::testNullService()
QAudioRecorder source;
QVERIFY(!source.isAvailable());
QCOMPARE(source.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(source.availability(), QtMultimedia::ServiceMissing);
QCOMPARE(source.audioInputs().size(), 0);
QCOMPARE(source.defaultAudioInput(), QString());
@@ -120,7 +120,7 @@ void tst_QAudioRecorder::testNullControl()
QAudioRecorder source;
QVERIFY(!source.isAvailable());
QCOMPARE(source.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(source.availability(), QtMultimedia::ServiceMissing);
QCOMPARE(source.audioInputs().size(), 0);
QCOMPARE(source.defaultAudioInput(), QString());
@@ -163,7 +163,7 @@ void tst_QAudioRecorder::testAvailability()
QAudioRecorder source;
QVERIFY(source.isAvailable());
QCOMPARE(source.availabilityError(), QtMultimedia::NoError);
QCOMPARE(source.availability(), QtMultimedia::Available);
}
void tst_QAudioRecorder::testAvailableAudioInputChangedSignal()

4
tests/auto/unit/qcamera/tst_qcamera.cpp
View File

@@ -1233,7 +1233,7 @@ void tst_QCamera::testQCameraIsAvailable()
{
QCamera camera;
QVERIFY(camera.isAvailable());
QVERIFY(camera.availabilityError() == QtMultimedia::NoError);
QVERIFY(camera.availability() == QtMultimedia::Available);
}
void tst_QCamera::testQCameraIsNotAvailable()
@@ -1243,7 +1243,7 @@ void tst_QCamera::testQCameraIsNotAvailable()
QCOMPARE(camera.error(), QCamera::ServiceMissingError);
QVERIFY(!camera.isAvailable());
QCOMPARE(camera.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(camera.availability(), QtMultimedia::ServiceMissing);
}
/* Test case for searchAndLock ( QCamera::LockTypes locks ) */

6
tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp
View File

@@ -312,7 +312,7 @@ void tst_QCameraImageCapture::errors()
imageCapture1.capture(QString::fromLatin1("/dev/null"));
QVERIFY(imageCapture1.error() == QCameraImageCapture::NotSupportedFeatureError);
QVERIFY2(!imageCapture1.errorString().isEmpty(), "Device does not support images capture");
QVERIFY(imageCapture1.availabilityError() == QtMultimedia::ServiceMissingError);
QVERIFY(imageCapture1.availability() == QtMultimedia::ServiceMissing);
provider->service = mockcameraservice;
@@ -321,12 +321,12 @@ void tst_QCameraImageCapture::errors()
QVERIFY(imageCapture.isAvailable() == true);
QVERIFY(imageCapture.error() == QCameraImageCapture::NoError);
QVERIFY(imageCapture.errorString().isEmpty());
QVERIFY(imageCapture.availabilityError() == QtMultimedia::NoError);
QVERIFY(imageCapture.availability() == QtMultimedia::Available);
imageCapture.capture();
QVERIFY(imageCapture.error() == QCameraImageCapture::NotReadyError);
QVERIFY2(!imageCapture.errorString().isEmpty(), "Could not capture in stopped state");
QVERIFY(imageCapture.availabilityError() == QtMultimedia::NoError);
QVERIFY(imageCapture.availability() == QtMultimedia::Available);
}
//MaemoAPI-1831:test error

34
tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
View File

@@ -441,54 +441,54 @@ void tst_QMediaObject::availability()
{
QtTestMediaObject nullObject(0);
QCOMPARE(nullObject.isAvailable(), false);
QCOMPARE(nullObject.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(nullObject.availability(), QtMultimedia::ServiceMissing);
}
{
QtTestMediaObjectService service;
QtTestMediaObject object(&service);
QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
QCOMPARE(object.availability(), QtMultimedia::Available);
}
{
MockAvailabilityControl available(QtMultimedia::NoError);
MockAvailabilityControl available(QtMultimedia::Available);
QtTestMediaObjectService service(0, &available);
QtTestMediaObject object(&service);
QSignalSpy availabilitySpy(&object, SIGNAL(availabilityChanged(bool)));
QSignalSpy availabilityErrorSpy(&object, SIGNAL(availabilityChanged(bool)));
QSignalSpy availabilityStatusSpy(&object, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)));
QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
QCOMPARE(object.availability(), QtMultimedia::Available);
available.setAvailability(QtMultimedia::BusyError);
available.setAvailability(QtMultimedia::Busy);
QCOMPARE(object.isAvailable(), false);
QCOMPARE(object.availabilityError(), QtMultimedia::BusyError);
QCOMPARE(object.availability(), QtMultimedia::Busy);
QCOMPARE(availabilitySpy.count(), 1);
QCOMPARE(availabilityErrorSpy.count(), 1);
QCOMPARE(availabilityStatusSpy.count(), 1);
available.setAvailability(QtMultimedia::NoError);
available.setAvailability(QtMultimedia::Available);
QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
QCOMPARE(object.availability(), QtMultimedia::Available);
QCOMPARE(availabilitySpy.count(), 2);
QCOMPARE(availabilityErrorSpy.count(), 2);
QCOMPARE(availabilityStatusSpy.count(), 2);
}
{
MockAvailabilityControl available(QtMultimedia::BusyError);
MockAvailabilityControl available(QtMultimedia::Busy);
QtTestMediaObjectService service(0, &available);
QtTestMediaObject object(&service);
QSignalSpy availabilitySpy(&object, SIGNAL(availabilityChanged(bool)));
QSignalSpy availabilityErrorSpy(&object, SIGNAL(availabilityChanged(bool)));
QSignalSpy availabilityStatusSpy(&object, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)));
QCOMPARE(object.isAvailable(), false);
QCOMPARE(object.availabilityError(), QtMultimedia::BusyError);
QCOMPARE(object.availability(), QtMultimedia::Busy);
available.setAvailability(QtMultimedia::NoError);
available.setAvailability(QtMultimedia::Available);
QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
QCOMPARE(object.availability(), QtMultimedia::Available);
QCOMPARE(availabilitySpy.count(), 1);
QCOMPARE(availabilityErrorSpy.count(), 1);
QCOMPARE(availabilityStatusSpy.count(), 1);
}
}

4
tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp
View File

@@ -222,7 +222,7 @@ void tst_QMediaPlayer::testNullService()
QCOMPARE(player.playbackRate(), qreal(0));
QCOMPARE(player.error(), QMediaPlayer::ServiceMissingError);
QCOMPARE(player.isAvailable(), false);
QCOMPARE(player.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(player.availability(), QtMultimedia::ServiceMissing);
{
QFETCH_GLOBAL(QMediaContent, mediaContent);
@@ -501,7 +501,7 @@ void tst_QMediaPlayer::testErrorString()
void tst_QMediaPlayer::testIsAvailable()
{
QCOMPARE(player->isAvailable(), true);
QCOMPARE(player->availabilityError(), QtMultimedia::NoError);
QCOMPARE(player->availability(), QtMultimedia::Available);
}
void tst_QMediaPlayer::testService()

26
tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
View File

@@ -100,7 +100,7 @@ private slots:
void testAudioSettingsOperatorAssign();
void testAudioSettingsDestructor();
void testAvailabilityError();
void testAvailabilityStatus();
void testIsAvailable();
void testMediaObject();
void testEnum();
@@ -1113,14 +1113,14 @@ void tst_QMediaRecorder::testAudioSettingsDestructor()
delete audiosettings;
}
/* availabilityError() API test. */
void tst_QMediaRecorder::testAvailabilityError()
/* availability() API test. */
void tst_QMediaRecorder::testAvailabilityStatus()
{
{
MockMediaRecorderService service(0, 0);
MockMediaObject object(0, &service);
QMediaRecorder recorder(&object);
QCOMPARE(recorder.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(recorder.availability(), QtMultimedia::ServiceMissing);
QCOMPARE(recorder.isAvailable(), false);
}
{
@@ -1129,7 +1129,7 @@ void tst_QMediaRecorder::testAvailabilityError()
service1.mockMetaDataControl->populateMetaData();
MockMediaObject object1(0, &service1);
QMediaRecorder recorder1(&object1);
QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
QCOMPARE(recorder1.availability(), QtMultimedia::Available);
QCOMPARE(recorder1.isAvailable(), true);
}
{
@@ -1139,29 +1139,29 @@ void tst_QMediaRecorder::testAvailabilityError()
MockMediaObject object1(0, &service1);
QMediaRecorder recorder1(&object1);
QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
QCOMPARE(recorder1.availability(), QtMultimedia::Available);
QCOMPARE(recorder1.isAvailable(), true);
}
{
MockMediaRecorderControl recorderControl(0);
MockAvailabilityControl availability(QtMultimedia::NoError);
MockAvailabilityControl availability(QtMultimedia::Available);
MockMediaRecorderService service1(0, &recorderControl, &availability);
service1.mockMetaDataControl->populateMetaData();
MockMediaObject object1(0, &service1);
QMediaRecorder recorder1(&object1);
QSignalSpy spy(&object1, SIGNAL(availabilityErrorChanged(QtMultimedia::AvailabilityError)));
QSignalSpy spy(&object1, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)));
QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
QCOMPARE(recorder1.availability(), QtMultimedia::Available);
QCOMPARE(recorder1.isAvailable(), true);
availability.setAvailability(QtMultimedia::BusyError);
QCOMPARE(recorder1.availabilityError(), QtMultimedia::BusyError);
availability.setAvailability(QtMultimedia::Busy);
QCOMPARE(recorder1.availability(), QtMultimedia::Busy);
QCOMPARE(recorder1.isAvailable(), false);
QCOMPARE(spy.count(), 1);
availability.setAvailability(QtMultimedia::NoError);
QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
availability.setAvailability(QtMultimedia::Available);
QCOMPARE(recorder1.availability(), QtMultimedia::Available);
QCOMPARE(recorder1.isAvailable(), true);
QCOMPARE(spy.count(), 2);
}

8
tests/auto/unit/qmultimedia_common/mockavailabilitycontrol.h
View File

@@ -50,18 +50,18 @@ class MockAvailabilityControl : public QMediaAvailabilityControl
Q_OBJECT
public:
MockAvailabilityControl(QtMultimedia::AvailabilityError available)
MockAvailabilityControl(QtMultimedia::AvailabilityStatus available)
: m_availability(available)
{
}
QtMultimedia::AvailabilityError availability() const
QtMultimedia::AvailabilityStatus availability() const
{
return m_availability;
}
void setAvailability(QtMultimedia::AvailabilityError availability)
void setAvailability(QtMultimedia::AvailabilityStatus availability)
{
if (m_availability != availability) {
m_availability = availability;
@@ -69,7 +69,7 @@ public:
}
}
QtMultimedia::AvailabilityError m_availability;
QtMultimedia::AvailabilityStatus m_availability;
};
#endif // MOCKAVAILABILITYCONTROL_H

4
tests/auto/unit/qradiodata/tst_qradiodata.cpp
View File

@@ -89,7 +89,7 @@ void tst_QRadioData::initTestCase()
{
qRegisterMetaType<QRadioData::ProgramType>("QRadioData::ProgramType");
mockAvailability = new MockAvailabilityControl(QtMultimedia::NoError);
mockAvailability = new MockAvailabilityControl(QtMultimedia::Available);
mockTuner = new MockRadioTunerControl(this);
mockData = new MockRadioDataControl(this);
@@ -105,7 +105,7 @@ void tst_QRadioData::initTestCase()
radio = new QRadioTuner;
radioData = radio->radioData();
QVERIFY(radioData->availabilityError() == QtMultimedia::NoError);
QVERIFY(radioData->availability() == QtMultimedia::Available);
}
void tst_QRadioData::cleanupTestCase()

8
tests/auto/unit/qradiotuner/tst_qradiotuner.cpp
View File

@@ -95,7 +95,7 @@ void tst_QRadioTuner::initTestCase()
qRegisterMetaType<QRadioTuner::Band>("QRadioTuner::Band");
mock = new MockRadioTunerControl(this);
mockAvailability = new MockAvailabilityControl(QtMultimedia::NoError);
mockAvailability = new MockAvailabilityControl(QtMultimedia::Available);
QMap<QString, QMediaControl *> map;
map.insert(QRadioTunerControl_iid, mock);
@@ -108,13 +108,13 @@ void tst_QRadioTuner::initTestCase()
radio = new QRadioTuner;
QVERIFY(radio->service() != 0);
QVERIFY(radio->isAvailable());
QVERIFY(radio->availabilityError() == QtMultimedia::NoError);
QVERIFY(radio->availability() == QtMultimedia::Available);
QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State)));
QCOMPARE(radio->state(), QRadioTuner::StoppedState);
radio->start();
QVERIFY(radio->availabilityError() == QtMultimedia::NoError);
QVERIFY(radio->availability() == QtMultimedia::Available);
QCOMPARE(radio->state(), QRadioTuner::ActiveState);
QCOMPARE(stateSpy.count(), 1);
@@ -129,7 +129,7 @@ void tst_QRadioTuner::cleanupTestCase()
QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State)));
radio->stop();
QVERIFY(radio->availabilityError() == QtMultimedia::NoError);
QVERIFY(radio->availability() == QtMultimedia::Available);
QCOMPARE(radio->state(), QRadioTuner::StoppedState);
QCOMPARE(stateSpy.count(), 1);

2
tests/auto/unit/qvideoprobe/tst_qvideoprobe.cpp
View File

@@ -116,7 +116,7 @@ void tst_QVideoProbe::testNullService()
player = new QMediaPlayer;
QVERIFY(!player->isAvailable());
QCOMPARE(player->availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(player->availability(), QtMultimedia::ServiceMissing);
QVideoProbe probe;
QVERIFY(!probe.isActive());