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

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;
};