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

Rename namespace QtMultimedia -> QMultimedia

Browse Source 
Main code, examples, tests and docs updated. Method:
1. Mass find+replace "QtMultimedia::" -> "QMultimedia::"
2. Hand-modified declaration in qtmedianamespace.h/cpp

For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed.

Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)

Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Sze Howe Koh
2012-11-01 00:33:21 +08:00
committed by The Qt Project
parent 13fd00199a
commit 832c3929f2
78 changed files with 381 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/audiorecorder/audiorecorder.cpp
View File

@@ -91,8 +91,8 @@ AudioRecorder::AudioRecorder(QWidget *parent)
sampleRate)); sampleRate));
} }
ui->qualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality)); ui->qualitySlider->setRange(0, int(QMultimedia::VeryHighQuality));
ui->qualitySlider->setValue(int(QtMultimedia::NormalQuality)); ui->qualitySlider->setValue(int(QMultimedia::NormalQuality));
//bitrates: //bitrates:
ui->bitrateBox->addItem(QString("Default"), QVariant(0)); ui->bitrateBox->addItem(QString("Default"), QVariant(0));
@@ -175,10 +175,10 @@ void AudioRecorder::toggleRecord()
settings.setCodec(boxValue(ui->audioCodecBox).toString()); settings.setCodec(boxValue(ui->audioCodecBox).toString());
settings.setSampleRate(boxValue(ui->sampleRateBox).toInt()); settings.setSampleRate(boxValue(ui->sampleRateBox).toInt());
settings.setBitRate(boxValue(ui->bitrateBox).toInt()); settings.setBitRate(boxValue(ui->bitrateBox).toInt());
settings.setQuality(QtMultimedia::EncodingQuality(ui->qualitySlider->value())); settings.setQuality(QMultimedia::EncodingQuality(ui->qualitySlider->value()));
settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ? settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ?
QtMultimedia::ConstantQualityEncoding : QMultimedia::ConstantQualityEncoding :
QtMultimedia::ConstantBitRateEncoding); QMultimedia::ConstantBitRateEncoding);
QString container = boxValue(ui->containerBox).toString(); QString container = boxValue(ui->containerBox).toString();

10
examples/audiorecorder/doc/src/audiorecorder.qdoc
View File

@@ -45,8 +45,8 @@
\l{QAudioRecorder::supportedContainers()}{supportedContainers()}, and \l{QAudioRecorder::supportedContainers()}{supportedContainers()}, and
\l{QAudioRecorder::supportedAudioSampleRates()}{supportedAudioSampleRates()} \l{QAudioRecorder::supportedAudioSampleRates()}{supportedAudioSampleRates()}
methods. The quality slider is setup from 0 (zero) to methods. The quality slider is setup from 0 (zero) to
\l{QtMultimedia::VeryHighQuality} with a default value of \l{QMultimedia::VeryHighQuality} with a default value of
\l{QtMultimedia::NormalQuality}, while the bitrates are hardcoded \l{QMultimedia::NormalQuality}, while the bitrates are hardcoded
into the list. into the list.
\image audiorecorder.png \image audiorecorder.png
@@ -77,10 +77,10 @@
settings.setCodec(boxValue(ui->audioCodecBox).toString()); settings.setCodec(boxValue(ui->audioCodecBox).toString());
settings.setSampleRate(boxValue(ui->sampleRateBox).toInt()); settings.setSampleRate(boxValue(ui->sampleRateBox).toInt());
settings.setBitRate(boxValue(ui->bitrateBox).toInt()); settings.setBitRate(boxValue(ui->bitrateBox).toInt());
settings.setQuality(QtMultimedia::EncodingQuality(ui->qualitySlider->value())); settings.setQuality(QMultimedia::EncodingQuality(ui->qualitySlider->value()));
settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ? settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ?
QtMultimedia::ConstantQualityEncoding : QMultimedia::ConstantQualityEncoding :
QtMultimedia::ConstantBitRateEncoding); QMultimedia::ConstantBitRateEncoding);
QString container = boxValue(ui->containerBox).toString(); QString container = boxValue(ui->containerBox).toString();

4
examples/camera/imagesettings.cpp
View File

@@ -62,7 +62,7 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent)
ui->imageCodecBox->addItem(codecName+": "+description, QVariant(codecName)); ui->imageCodecBox->addItem(codecName+": "+description, QVariant(codecName));
} }
ui->imageQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality)); ui->imageQualitySlider->setRange(0, int(QMultimedia::VeryHighQuality));
ui->imageResolutionBox->addItem(tr("Default Resolution")); ui->imageResolutionBox->addItem(tr("Default Resolution"));
QList<QSize> supportedResolutions = imagecapture->supportedResolutions(); QList<QSize> supportedResolutions = imagecapture->supportedResolutions();
@@ -93,7 +93,7 @@ QImageEncoderSettings ImageSettings::imageSettings() const
{ {
QImageEncoderSettings settings = imagecapture->encodingSettings(); QImageEncoderSettings settings = imagecapture->encodingSettings();
settings.setCodec(boxValue(ui->imageCodecBox).toString()); settings.setCodec(boxValue(ui->imageCodecBox).toString());
settings.setQuality(QtMultimedia::EncodingQuality(ui->imageQualitySlider->value())); settings.setQuality(QMultimedia::EncodingQuality(ui->imageQualitySlider->value()));
settings.setResolution(boxValue(ui->imageResolutionBox).toSize()); settings.setResolution(boxValue(ui->imageResolutionBox).toSize());
return settings; return settings;

8
examples/camera/videosettings.cpp
View File

@@ -66,7 +66,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) :
ui->audioSampleRateBox->addItem(QString::number(sampleRate), QVariant(sampleRate)); ui->audioSampleRateBox->addItem(QString::number(sampleRate), QVariant(sampleRate));
} }
ui->audioQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality)); ui->audioQualitySlider->setRange(0, int(QMultimedia::VeryHighQuality));
//video codecs //video codecs
ui->videoCodecBox->addItem(tr("Default video codec"), QVariant(QString())); ui->videoCodecBox->addItem(tr("Default video codec"), QVariant(QString()));
@@ -75,7 +75,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) :
ui->videoCodecBox->addItem(codecName+": "+description, QVariant(codecName)); ui->videoCodecBox->addItem(codecName+": "+description, QVariant(codecName));
} }
ui->videoQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality)); ui->videoQualitySlider->setRange(0, int(QMultimedia::VeryHighQuality));
ui->videoResolutionBox->addItem(tr("Default")); ui->videoResolutionBox->addItem(tr("Default"));
@@ -122,7 +122,7 @@ QAudioEncoderSettings VideoSettings::audioSettings() const
{ {
QAudioEncoderSettings settings = mediaRecorder->audioSettings(); QAudioEncoderSettings settings = mediaRecorder->audioSettings();
settings.setCodec(boxValue(ui->audioCodecBox).toString()); settings.setCodec(boxValue(ui->audioCodecBox).toString());
settings.setQuality(QtMultimedia::EncodingQuality(ui->audioQualitySlider->value())); settings.setQuality(QMultimedia::EncodingQuality(ui->audioQualitySlider->value()));
settings.setSampleRate(boxValue(ui->audioSampleRateBox).toInt()); settings.setSampleRate(boxValue(ui->audioSampleRateBox).toInt());
return settings; return settings;
} }
@@ -138,7 +138,7 @@ QVideoEncoderSettings VideoSettings::videoSettings() const
{ {
QVideoEncoderSettings settings = mediaRecorder->videoSettings(); QVideoEncoderSettings settings = mediaRecorder->videoSettings();
settings.setCodec(boxValue(ui->videoCodecBox).toString()); settings.setCodec(boxValue(ui->videoCodecBox).toString());
settings.setQuality(QtMultimedia::EncodingQuality(ui->videoQualitySlider->value())); settings.setQuality(QMultimedia::EncodingQuality(ui->videoQualitySlider->value()));
settings.setResolution(boxValue(ui->videoResolutionBox).toSize()); settings.setResolution(boxValue(ui->videoResolutionBox).toSize());
settings.setFrameRate(boxValue(ui->videoFramerateBox).value<qreal>()); settings.setFrameRate(boxValue(ui->videoFramerateBox).value<qreal>());

10
src/gsttools/qgstutils.cpp
View File

@@ -358,12 +358,12 @@ namespace {
} }
} }
QtMultimedia::SupportEstimate QGstUtils::hasSupport(const QString &mimeType, QMultimedia::SupportEstimate QGstUtils::hasSupport(const QString &mimeType,
const QStringList &codecs, const QStringList &codecs,
const QSet<QString> &supportedMimeTypeSet) const QSet<QString> &supportedMimeTypeSet)
{ {
if (supportedMimeTypeSet.isEmpty()) if (supportedMimeTypeSet.isEmpty())
return QtMultimedia::NotSupported; return QMultimedia::NotSupported;
QString mimeTypeLowcase = mimeType.toLower(); QString mimeTypeLowcase = mimeType.toLower();
bool containsMimeType = supportedMimeTypeSet.contains(mimeTypeLowcase); bool containsMimeType = supportedMimeTypeSet.contains(mimeTypeLowcase);
@@ -393,12 +393,12 @@ QtMultimedia::SupportEstimate QGstUtils::hasSupport(const QString &mimeType,
} }
} }
if (supportedCodecCount > 0 && supportedCodecCount == codecs.size()) if (supportedCodecCount > 0 && supportedCodecCount == codecs.size())
return QtMultimedia::ProbablySupported; return QMultimedia::ProbablySupported;
if (supportedCodecCount == 0 && !containsMimeType) if (supportedCodecCount == 0 && !containsMimeType)
return QtMultimedia::NotSupported; return QMultimedia::NotSupported;
return QtMultimedia::MaybeSupported; return QMultimedia::MaybeSupported;
} }
QT_END_NAMESPACE QT_END_NAMESPACE

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

@@ -1436,7 +1436,7 @@ Module {
Signal { Signal {
name: "availabilityChanged" name: "availabilityChanged"
type: "void" type: "void"
Parameter { name: "error"; type: "QtMultimedia::AvailabilityStatus" } Parameter { name: "error"; type: "QMultimedia::AvailabilityStatus" }
} }
} }
Component { Component {

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

@@ -100,7 +100,7 @@ void QDeclarativeAudio::_q_error(QMediaPlayer::Error errorCode)
emit errorChanged(); emit errorChanged();
} }
void QDeclarativeAudio::_q_availabilityChanged(QtMultimedia::AvailabilityStatus) void QDeclarativeAudio::_q_availabilityChanged(QMultimedia::AvailabilityStatus)
{ {
emit availabilityChanged(availability()); emit availabilityChanged(availability());
} }
@@ -659,10 +659,10 @@ void QDeclarativeAudio::classBegin()
connect(m_player, SIGNAL(videoAvailableChanged(bool)), connect(m_player, SIGNAL(videoAvailableChanged(bool)),
this, SIGNAL(hasVideoChanged())); this, SIGNAL(hasVideoChanged()));
m_error = m_player->availability() == QtMultimedia::ServiceMissing ? QMediaPlayer::ServiceMissingError : QMediaPlayer::NoError; m_error = m_player->availability() == QMultimedia::ServiceMissing ? QMediaPlayer::ServiceMissingError : QMediaPlayer::NoError;
connect(m_player, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), connect(m_player, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)),
this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus)));
m_metaData.reset(new QDeclarativeMediaMetaData(m_player)); m_metaData.reset(new QDeclarativeMediaMetaData(m_player));

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

@@ -138,10 +138,10 @@ public:
}; };
enum Availability { enum Availability {
Available = QtMultimedia::Available, Available = QMultimedia::Available,
Busy = QtMultimedia::Busy, Busy = QMultimedia::Busy,
Unavailable = QtMultimedia::ServiceMissing, Unavailable = QMultimedia::ServiceMissing,
ResourceMissing = QtMultimedia::ResourceError ResourceMissing = QMultimedia::ResourceError
}; };
QDeclarativeAudio(QObject *parent = 0); QDeclarativeAudio(QObject *parent = 0);
@@ -237,7 +237,7 @@ Q_SIGNALS:
private Q_SLOTS: private Q_SLOTS:
void _q_error(QMediaPlayer::Error); void _q_error(QMediaPlayer::Error);
void _q_availabilityChanged(QtMultimedia::AvailabilityStatus); void _q_availabilityChanged(QMultimedia::AvailabilityStatus);
void _q_statusChanged(); void _q_statusChanged();
private: private:

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

@@ -68,7 +68,7 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state)
emit cameraStateChanged(QDeclarativeCamera::State(state)); emit cameraStateChanged(QDeclarativeCamera::State(state));
} }
void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability) void QDeclarativeCamera::_q_availabilityChanged(QMultimedia::AvailabilityStatus availability)
{ {
emit availabilityChanged(Availability(availability)); emit availabilityChanged(Availability(availability));
} }
@@ -189,7 +189,7 @@ QDeclarativeCamera::QDeclarativeCamera(QObject *parent) :
connect(m_camera, SIGNAL(stateChanged(QCamera::State)), this, SLOT(_q_updateState(QCamera::State))); 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(statusChanged(QCamera::Status)), this, SIGNAL(cameraStatusChanged()));
connect(m_camera, SIGNAL(error(QCamera::Error)), this, SLOT(_q_error(QCamera::Error))); connect(m_camera, SIGNAL(error(QCamera::Error)), this, SLOT(_q_error(QCamera::Error)));
connect(m_camera, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); connect(m_camera, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus)));
connect(m_camera->focus(), SIGNAL(opticalZoomChanged(qreal)), this, SIGNAL(opticalZoomChanged(qreal))); connect(m_camera->focus(), SIGNAL(opticalZoomChanged(qreal)), this, SIGNAL(opticalZoomChanged(qreal)));
connect(m_camera->focus(), SIGNAL(digitalZoomChanged(qreal)), this, SIGNAL(digitalZoomChanged(qreal))); connect(m_camera->focus(), SIGNAL(digitalZoomChanged(qreal)), this, SIGNAL(digitalZoomChanged(qreal)));

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

@@ -216,10 +216,10 @@ public:
}; };
enum Availability { enum Availability {
Available = QtMultimedia::Available, Available = QMultimedia::Available,
Busy = QtMultimedia::Busy, Busy = QMultimedia::Busy,
Unavailable = QtMultimedia::ServiceMissing, Unavailable = QMultimedia::ServiceMissing,
ResourceMissing = QtMultimedia::ResourceError ResourceMissing = QMultimedia::ResourceError
}; };
QDeclarativeCamera(QObject *parent = 0); QDeclarativeCamera(QObject *parent = 0);
@@ -287,7 +287,7 @@ Q_SIGNALS:
private Q_SLOTS: private Q_SLOTS:
void _q_updateState(QCamera::State); void _q_updateState(QCamera::State);
void _q_error(QCamera::Error); void _q_error(QCamera::Error);
void _q_availabilityChanged(QtMultimedia::AvailabilityStatus); void _q_availabilityChanged(QMultimedia::AvailabilityStatus);
protected: protected:
void classBegin(); void classBegin();

8
src/imports/multimedia/qdeclarativecamerarecorder.cpp
View File

@@ -326,8 +326,8 @@ void QDeclarativeCameraRecorder::setAudioSampleRate(int rate)
void QDeclarativeCameraRecorder::setAudioEncodingMode(QDeclarativeCameraRecorder::EncodingMode encodingMode) void QDeclarativeCameraRecorder::setAudioEncodingMode(QDeclarativeCameraRecorder::EncodingMode encodingMode)
{ {
if (m_audioSettings.encodingMode() != QtMultimedia::EncodingMode(encodingMode)) { if (m_audioSettings.encodingMode() != QMultimedia::EncodingMode(encodingMode)) {
m_audioSettings.setEncodingMode(QtMultimedia::EncodingMode(encodingMode)); m_audioSettings.setEncodingMode(QMultimedia::EncodingMode(encodingMode));
m_recorder->setAudioSettings(m_audioSettings); m_recorder->setAudioSettings(m_audioSettings);
emit audioEncodingModeChanged(encodingMode); emit audioEncodingModeChanged(encodingMode);
} }
@@ -335,8 +335,8 @@ void QDeclarativeCameraRecorder::setAudioEncodingMode(QDeclarativeCameraRecorder
void QDeclarativeCameraRecorder::setVideoEncodingMode(QDeclarativeCameraRecorder::EncodingMode encodingMode) void QDeclarativeCameraRecorder::setVideoEncodingMode(QDeclarativeCameraRecorder::EncodingMode encodingMode)
{ {
if (m_videoSettings.encodingMode() != QtMultimedia::EncodingMode(encodingMode)) { if (m_videoSettings.encodingMode() != QMultimedia::EncodingMode(encodingMode)) {
m_videoSettings.setEncodingMode(QtMultimedia::EncodingMode(encodingMode)); m_videoSettings.setEncodingMode(QMultimedia::EncodingMode(encodingMode));
m_recorder->setVideoSettings(m_videoSettings); m_recorder->setVideoSettings(m_videoSettings);
emit videoEncodingModeChanged(encodingMode); emit videoEncodingModeChanged(encodingMode);
} }

6
src/imports/multimedia/qdeclarativecamerarecorder_p.h
View File

@@ -116,9 +116,9 @@ public:
enum EncodingMode enum EncodingMode
{ {
ConstantQualityEncoding = QtMultimedia::ConstantQualityEncoding, ConstantQualityEncoding = QMultimedia::ConstantQualityEncoding,
ConstantBitRateEncoding = QtMultimedia::ConstantBitRateEncoding, ConstantBitRateEncoding = QMultimedia::ConstantBitRateEncoding,
AverageBitRateEncoding = QtMultimedia::AverageBitRateEncoding AverageBitRateEncoding = QMultimedia::AverageBitRateEncoding
}; };
enum Error { enum Error {

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

@@ -116,7 +116,7 @@ QDeclarativeRadio::QDeclarativeRadio(QObject *parent) :
connect(m_radioTuner, SIGNAL(mutedChanged(bool)), this, SIGNAL(mutedChanged(bool))); 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(stationFound(int, QString)), this, SIGNAL(stationFound(int, QString)));
connect(m_radioTuner, SIGNAL(antennaConnectedChanged(bool)), this, SIGNAL(antennaConnectedChanged(bool))); connect(m_radioTuner, SIGNAL(antennaConnectedChanged(bool)), this, SIGNAL(antennaConnectedChanged(bool)));
connect(m_radioTuner, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); connect(m_radioTuner, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus)));
connect(m_radioTuner, SIGNAL(error(QRadioTuner::Error)), this, SLOT(_q_error(QRadioTuner::Error))); connect(m_radioTuner, SIGNAL(error(QRadioTuner::Error)), this, SLOT(_q_error(QRadioTuner::Error)));
} }
@@ -527,7 +527,7 @@ void QDeclarativeRadio::_q_error(QRadioTuner::Error errorCode)
emit errorChanged(); emit errorChanged();
} }
void QDeclarativeRadio::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability) void QDeclarativeRadio::_q_availabilityChanged(QMultimedia::AvailabilityStatus availability)
{ {
emit availabilityChanged(Availability(availability)); emit availabilityChanged(Availability(availability));
} }

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

@@ -120,10 +120,10 @@ public:
}; };
enum Availability { enum Availability {
Available = QtMultimedia::Available, Available = QMultimedia::Available,
Busy = QtMultimedia::Busy, Busy = QMultimedia::Busy,
Unavailable = QtMultimedia::ServiceMissing, Unavailable = QMultimedia::ServiceMissing,
ResourceMissing = QtMultimedia::ResourceError ResourceMissing = QMultimedia::ResourceError
}; };
QDeclarativeRadio(QObject *parent = 0); QDeclarativeRadio(QObject *parent = 0);
@@ -189,7 +189,7 @@ private Q_SLOTS:
void _q_stateChanged(QRadioTuner::State state); void _q_stateChanged(QRadioTuner::State state);
void _q_bandChanged(QRadioTuner::Band band); void _q_bandChanged(QRadioTuner::Band band);
void _q_error(QRadioTuner::Error errorCode); void _q_error(QRadioTuner::Error errorCode);
void _q_availabilityChanged(QtMultimedia::AvailabilityStatus); void _q_availabilityChanged(QMultimedia::AvailabilityStatus);
private: private:
Q_DISABLE_COPY(QDeclarativeRadio) Q_DISABLE_COPY(QDeclarativeRadio)

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

@@ -282,7 +282,7 @@ void QDeclarativeRadioData::_q_error(QRadioData::Error errorCode)
emit errorChanged(); emit errorChanged();
} }
void QDeclarativeRadioData::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability) void QDeclarativeRadioData::_q_availabilityChanged(QMultimedia::AvailabilityStatus availability)
{ {
emit availabilityChanged(Availability(availability)); emit availabilityChanged(Availability(availability));
} }
@@ -299,7 +299,7 @@ void QDeclarativeRadioData::connectSignals()
connect(m_radioData, SIGNAL(alternativeFrequenciesEnabledChanged(bool)), this, connect(m_radioData, SIGNAL(alternativeFrequenciesEnabledChanged(bool)), this,
SIGNAL(alternativeFrequenciesEnabledChanged(bool))); SIGNAL(alternativeFrequenciesEnabledChanged(bool)));
// Since the radio data type depends on the service for the tuner, the availability is also dictated from the tuner // Since the radio data type depends on the service for the tuner, the availability is also dictated from the tuner
connect(m_radioTuner, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); connect(m_radioTuner, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus)));
connect(m_radioData, SIGNAL(error(QRadioData::Error)), this, SLOT(_q_error(QRadioData::Error))); connect(m_radioData, SIGNAL(error(QRadioData::Error)), this, SLOT(_q_error(QRadioData::Error)));
} }

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

@@ -137,10 +137,10 @@ public:
}; };
enum Availability { enum Availability {
Available = QtMultimedia::Available, Available = QMultimedia::Available,
Busy = QtMultimedia::Busy, Busy = QMultimedia::Busy,
Unavailable = QtMultimedia::ServiceMissing, Unavailable = QMultimedia::ServiceMissing,
ResourceMissing = QtMultimedia::ResourceError ResourceMissing = QMultimedia::ResourceError
}; };
QDeclarativeRadioData(QObject *parent = 0); QDeclarativeRadioData(QObject *parent = 0);
@@ -176,7 +176,7 @@ Q_SIGNALS:
private Q_SLOTS: private Q_SLOTS:
void _q_programTypeChanged(QRadioData::ProgramType programType); void _q_programTypeChanged(QRadioData::ProgramType programType);
void _q_error(QRadioData::Error errorCode); void _q_error(QRadioData::Error errorCode);
void _q_availabilityChanged(QtMultimedia::AvailabilityStatus); void _q_availabilityChanged(QMultimedia::AvailabilityStatus);
private: private:
void connectSignals(); void connectSignals();

2
src/multimedia/audio/qaudiodecoder.cpp
View File

@@ -359,7 +359,7 @@ void QAudioDecoder::unbind(QObject *obj)
/*! /*!
Returns the level of support an audio decoder has for a \a mimeType and a set of \a codecs. Returns the level of support an audio decoder has for a \a mimeType and a set of \a codecs.
*/ */
QtMultimedia::SupportEstimate QAudioDecoder::hasSupport(const QString &mimeType, QMultimedia::SupportEstimate QAudioDecoder::hasSupport(const QString &mimeType,
const QStringList& codecs) const QStringList& codecs)
{ {
return QMediaServiceProvider::defaultServiceProvider()->hasSupport(QByteArray(Q_MEDIASERVICE_AUDIODECODER), return QMediaServiceProvider::defaultServiceProvider()->hasSupport(QByteArray(Q_MEDIASERVICE_AUDIODECODER),

2
src/multimedia/audio/qaudiodecoder.h
View File

@@ -82,7 +82,7 @@ public:
QAudioDecoder(QObject *parent = 0); QAudioDecoder(QObject *parent = 0);
~QAudioDecoder(); ~QAudioDecoder();
static QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs = QStringList()); static QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs = QStringList());
State state() const; State state() const;

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

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

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

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

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

@@ -314,12 +314,12 @@ bool QCameraImageCapture::isAvailable() const
/*! /*!
Returns the availability of this functionality. Returns the availability of this functionality.
*/ */
QtMultimedia::AvailabilityStatus QCameraImageCapture::availability() const QMultimedia::AvailabilityStatus QCameraImageCapture::availability() const
{ {
if (d_func()->control != NULL) if (d_func()->control != NULL)
return QtMultimedia::Available; return QMultimedia::Available;
else else
return QtMultimedia::ServiceMissing; return QMultimedia::ServiceMissing;
} }
/*! /*!

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

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

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

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

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

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

6
src/multimedia/doc/src/snippets/multimedia-snippets/media.cpp
View File

@@ -200,7 +200,7 @@ void MediaExample::MediaRecorder()
QAudioEncoderSettings audioSettings; QAudioEncoderSettings audioSettings;
audioSettings.setCodec("audio/amr"); audioSettings.setCodec("audio/amr");
audioSettings.setQuality(QtMultimedia::HighQuality); audioSettings.setQuality(QMultimedia::HighQuality);
recorder->setAudioSettings(audioSettings); recorder->setAudioSettings(audioSettings);
@@ -216,7 +216,7 @@ void MediaExample::AudioRecorder()
QAudioEncoderSettings audioSettings; QAudioEncoderSettings audioSettings;
audioSettings.setCodec("audio/amr"); audioSettings.setCodec("audio/amr");
audioSettings.setQuality(QtMultimedia::HighQuality); audioSettings.setQuality(QMultimedia::HighQuality);
audioRecorder->setEncodingSettings(audioSettings); audioRecorder->setEncodingSettings(audioSettings);
@@ -264,7 +264,7 @@ void MediaExample::AudioProbe()
QAudioEncoderSettings audioSettings; QAudioEncoderSettings audioSettings;
audioSettings.setCodec("audio/amr"); audioSettings.setCodec("audio/amr");
audioSettings.setQuality(QtMultimedia::HighQuality); audioSettings.setQuality(QMultimedia::HighQuality);
audioRecorder->setEncodingSettings(audioSettings); audioRecorder->setEncodingSettings(audioSettings);

2
src/multimedia/gsttools_headers/qgstutils_p.h
View File

@@ -73,7 +73,7 @@ namespace QGstUtils {
QAudioFormat audioFormatForBuffer(GstBuffer *buffer); QAudioFormat audioFormatForBuffer(GstBuffer *buffer);
GstCaps *capsForAudioFormat(QAudioFormat format); GstCaps *capsForAudioFormat(QAudioFormat format);
void initializeGst(); void initializeGst();
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, QMultimedia::SupportEstimate hasSupport(const QString &mimeType,
const QStringList &codecs, const QStringList &codecs,
const QSet<QString> &supportedMimeTypeSet); const QSet<QString> &supportedMimeTypeSet);
} }

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

@@ -913,7 +913,7 @@ void QMediaPlayer::unbind(QObject *obj)
The \a flags argument allows additional requirements such as performance indicators to be The \a flags argument allows additional requirements such as performance indicators to be
specified. specified.
*/ */
QtMultimedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType, QMultimedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType,
const QStringList& codecs, const QStringList& codecs,
Flags flags) Flags flags)
{ {
@@ -1013,12 +1013,12 @@ void QMediaPlayer::setVideoOutput(QAbstractVideoSurface *surface)
} }
/*! \reimp */ /*! \reimp */
QtMultimedia::AvailabilityStatus QMediaPlayer::availability() const QMultimedia::AvailabilityStatus QMediaPlayer::availability() const
{ {
Q_D(const QMediaPlayer); Q_D(const QMediaPlayer);
if (!d->control) if (!d->control)
return QtMultimedia::ServiceMissing; return QMultimedia::ServiceMissing;
return QMediaObject::availability(); return QMediaObject::availability();
} }

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

@@ -124,7 +124,7 @@ public:
QMediaPlayer(QObject *parent = 0, Flags flags = 0); QMediaPlayer(QObject *parent = 0, Flags flags = 0);
~QMediaPlayer(); ~QMediaPlayer();
static QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, static QMultimedia::SupportEstimate hasSupport(const QString &mimeType,
const QStringList& codecs = QStringList(), const QStringList& codecs = QStringList(),
Flags flags = 0); Flags flags = 0);
static QStringList supportedMimeTypes(Flags flags = 0); static QStringList supportedMimeTypes(Flags flags = 0);
@@ -159,7 +159,7 @@ public:
QNetworkConfiguration currentNetworkConfiguration() const; QNetworkConfiguration currentNetworkConfiguration() const;
QtMultimedia::AvailabilityStatus availability() const; QMultimedia::AvailabilityStatus availability() const;
public Q_SLOTS: public Q_SLOTS:
void play(); void play();

12
src/multimedia/qmediaobject.cpp
View File

@@ -121,15 +121,15 @@ QMediaObject::~QMediaObject()
audio playback during a phone call or similar). audio playback during a phone call or similar).
*/ */
QtMultimedia::AvailabilityStatus QMediaObject::availability() const QMultimedia::AvailabilityStatus QMediaObject::availability() const
{ {
if (d_func()->service == 0) if (d_func()->service == 0)
return QtMultimedia::ServiceMissing; return QMultimedia::ServiceMissing;
if (d_func()->availabilityControl) if (d_func()->availabilityControl)
return d_func()->availabilityControl->availability(); return d_func()->availabilityControl->availability();
return QtMultimedia::Available; return QMultimedia::Available;
} }
/*! /*!
@@ -138,7 +138,7 @@ QtMultimedia::AvailabilityStatus QMediaObject::availability() const
bool QMediaObject::isAvailable() const bool QMediaObject::isAvailable() const
{ {
return availability() == QtMultimedia::Available; return availability() == QMultimedia::Available;
} }
/*! /*!
@@ -408,7 +408,7 @@ void QMediaObject::setupControls()
d->availabilityControl = d->service->requestControl<QMediaAvailabilityControl*>(); d->availabilityControl = d->service->requestControl<QMediaAvailabilityControl*>();
if (d->availabilityControl) { if (d->availabilityControl) {
connect(d->availabilityControl, connect(d->availabilityControl,
SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)),
SLOT(_q_availabilityChanged())); SLOT(_q_availabilityChanged()));
} }
} }
@@ -421,7 +421,7 @@ void QMediaObject::setupControls()
*/ */
/*! /*!
\fn QMediaObject::availabilityChanged(QtMultimedia::AvailabilityStatus availability) \fn QMediaObject::availabilityChanged(QMultimedia::AvailabilityStatus availability)
Signal emitted when the availability of the service has changed to \a availabilty Signal emitted when the availability of the service has changed to \a availabilty
*/ */

4
src/multimedia/qmediaobject.h
View File

@@ -65,7 +65,7 @@ public:
~QMediaObject(); ~QMediaObject();
virtual bool isAvailable() const; virtual bool isAvailable() const;
virtual QtMultimedia::AvailabilityStatus availability() const; virtual QMultimedia::AvailabilityStatus availability() const;
virtual QMediaService* service() const; virtual QMediaService* service() const;
@@ -88,7 +88,7 @@ Q_SIGNALS:
void metaDataChanged(const QString &key, const QVariant &value); void metaDataChanged(const QString &key, const QVariant &value);
void availabilityChanged(bool available); void availabilityChanged(bool available);
void availabilityChanged(QtMultimedia::AvailabilityStatus availability); void availabilityChanged(QMultimedia::AvailabilityStatus availability);
protected: protected:
QMediaObject(QObject *parent, QMediaService *service); QMediaObject(QObject *parent, QMediaService *service);

22
src/multimedia/qmediaserviceprovider.cpp
View File

@@ -346,9 +346,9 @@ public:
} }
break; break;
case QMediaServiceProviderHint::ContentType: { case QMediaServiceProviderHint::ContentType: {
QtMultimedia::SupportEstimate estimate = QtMultimedia::NotSupported; QMultimedia::SupportEstimate estimate = QMultimedia::NotSupported;
foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) { foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) {
QtMultimedia::SupportEstimate currentEstimate = QtMultimedia::MaybeSupported; QMultimedia::SupportEstimate currentEstimate = QMultimedia::MaybeSupported;
QMediaServiceSupportedFormatsInterface *iface = QMediaServiceSupportedFormatsInterface *iface =
qobject_cast<QMediaServiceSupportedFormatsInterface*>(currentPlugin); qobject_cast<QMediaServiceSupportedFormatsInterface*>(currentPlugin);
@@ -359,7 +359,7 @@ public:
estimate = currentEstimate; estimate = currentEstimate;
plugin = currentPlugin; plugin = currentPlugin;
if (currentEstimate == QtMultimedia::PreferredService) if (currentEstimate == QMultimedia::PreferredService)
break; break;
} }
} }
@@ -390,7 +390,7 @@ public:
} }
} }
QtMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType, QMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType,
const QString &mimeType, const QString &mimeType,
const QStringList& codecs, const QStringList& codecs,
int flags) const int flags) const
@@ -398,10 +398,10 @@ public:
QList<QObject*> instances = loader()->instances(QLatin1String(serviceType)); QList<QObject*> instances = loader()->instances(QLatin1String(serviceType));
if (instances.isEmpty()) if (instances.isEmpty())
return QtMultimedia::NotSupported; return QMultimedia::NotSupported;
bool allServicesProvideInterface = true; bool allServicesProvideInterface = true;
QtMultimedia::SupportEstimate supportEstimate = QtMultimedia::NotSupported; QMultimedia::SupportEstimate supportEstimate = QMultimedia::NotSupported;
foreach(QObject *obj, instances) { foreach(QObject *obj, instances) {
QMediaServiceSupportedFormatsInterface *iface = QMediaServiceSupportedFormatsInterface *iface =
@@ -435,12 +435,12 @@ public:
} }
//don't return PreferredService //don't return PreferredService
supportEstimate = qMin(supportEstimate, QtMultimedia::ProbablySupported); supportEstimate = qMin(supportEstimate, QMultimedia::ProbablySupported);
//Return NotSupported only if no services are available of serviceType //Return NotSupported only if no services are available of serviceType
//or all the services returned NotSupported, otherwise return at least MaybeSupported //or all the services returned NotSupported, otherwise return at least MaybeSupported
if (!allServicesProvideInterface) if (!allServicesProvideInterface)
supportEstimate = qMax(QtMultimedia::MaybeSupported, supportEstimate); supportEstimate = qMax(QMultimedia::MaybeSupported, supportEstimate);
return supportEstimate; return supportEstimate;
} }
@@ -557,14 +557,14 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider);
*/ */
/*! /*!
\fn QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const \fn QMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const
Returns how confident a media service provider is that is can provide a \a Returns how confident a media service provider is that is can provide a \a
serviceType service that is able to play media of a specific \a mimeType serviceType service that is able to play media of a specific \a mimeType
that is encoded using the listed \a codecs while adhering to constraints that is encoded using the listed \a codecs while adhering to constraints
identified in \a flags. identified in \a flags.
*/ */
QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, QMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType,
const QString &mimeType, const QString &mimeType,
const QStringList& codecs, const QStringList& codecs,
int flags) const int flags) const
@@ -574,7 +574,7 @@ QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray
Q_UNUSED(codecs); Q_UNUSED(codecs);
Q_UNUSED(flags); Q_UNUSED(flags);
return QtMultimedia::MaybeSupported; return QMultimedia::MaybeSupported;
} }
/*! /*!

2
src/multimedia/qmediaserviceprovider_p.h
View File

@@ -63,7 +63,7 @@ public:
virtual QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint = QMediaServiceProviderHint()) = 0; virtual QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint = QMediaServiceProviderHint()) = 0;
virtual void releaseService(QMediaService *service) = 0; virtual void releaseService(QMediaService *service) = 0;
virtual QtMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType, virtual QMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType,
const QString &mimeType, const QString &mimeType,
const QStringList& codecs, const QStringList& codecs,
int flags = 0) const; int flags = 0) const;

2
src/multimedia/qmediaserviceproviderplugin.h
View File

@@ -124,7 +124,7 @@ class QString;
struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedFormatsInterface struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedFormatsInterface
{ {
virtual ~QMediaServiceSupportedFormatsInterface() {} virtual ~QMediaServiceSupportedFormatsInterface() {}
virtual QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0; virtual QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0;
virtual QStringList supportedMimeTypes() const = 0; virtual QStringList supportedMimeTypes() const = 0;
}; };

20
src/multimedia/qtmedianamespace.cpp
View File

@@ -30,7 +30,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
/*! /*!
\namespace QtMultimedia \namespace QMultimedia
\inheaderfile qtmedianamespace.h \inheaderfile qtmedianamespace.h
\ingroup multimedia \ingroup multimedia
\inmodule QtMultimedia \inmodule QtMultimedia
@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia \ingroup multimedia
\ingroup multimedia_core \ingroup multimedia_core
\brief The QtMultimedia namespace contains miscellaneous identifiers used throughout the Qt Multimedia library. \brief The QMultimedia namespace contains miscellaneous identifiers used throughout the Qt Multimedia library.
*/ */
@@ -49,16 +49,16 @@ namespace
public: public:
QMultimediaNamespacePrivateRegisterMetaTypes() QMultimediaNamespacePrivateRegisterMetaTypes()
{ {
qRegisterMetaType<QtMultimedia::AvailabilityStatus>(); qRegisterMetaType<QMultimedia::AvailabilityStatus>();
qRegisterMetaType<QtMultimedia::SupportEstimate>(); qRegisterMetaType<QMultimedia::SupportEstimate>();
qRegisterMetaType<QtMultimedia::EncodingMode>(); qRegisterMetaType<QMultimedia::EncodingMode>();
qRegisterMetaType<QtMultimedia::EncodingQuality>(); qRegisterMetaType<QMultimedia::EncodingQuality>();
} }
} _registerMetaTypes; } _registerMetaTypes;
} }
/*! /*!
\enum QtMultimedia::SupportEstimate \enum QMultimedia::SupportEstimate
Enumerates the levels of support a media service provider may have for a feature. Enumerates the levels of support a media service provider may have for a feature.
@@ -69,7 +69,7 @@ namespace
*/ */
/*! /*!
\enum QtMultimedia::EncodingQuality \enum QMultimedia::EncodingQuality
Enumerates quality encoding levels. Enumerates quality encoding levels.
@@ -81,7 +81,7 @@ namespace
*/ */
/*! /*!
\enum QtMultimedia::EncodingMode \enum QMultimedia::EncodingMode
Enumerates encoding modes. Enumerates encoding modes.
@@ -95,7 +95,7 @@ namespace
*/ */
/*! /*!
\enum QtMultimedia::AvailabilityStatus \enum QMultimedia::AvailabilityStatus
Enumerates Service status errors. Enumerates Service status errors.

13
src/multimedia/qtmedianamespace.h
View File

@@ -53,10 +53,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
// Class forward declaration required for QDoc bug namespace QMultimedia
class QString;
namespace QtMultimedia
{ {
enum SupportEstimate enum SupportEstimate
{ {
@@ -95,10 +92,10 @@ namespace QtMultimedia
QT_END_NAMESPACE QT_END_NAMESPACE
Q_DECLARE_METATYPE(QtMultimedia::AvailabilityStatus) Q_DECLARE_METATYPE(QMultimedia::AvailabilityStatus)
Q_DECLARE_METATYPE(QtMultimedia::SupportEstimate) Q_DECLARE_METATYPE(QMultimedia::SupportEstimate)
Q_DECLARE_METATYPE(QtMultimedia::EncodingMode) Q_DECLARE_METATYPE(QMultimedia::EncodingMode)
Q_DECLARE_METATYPE(QtMultimedia::EncodingQuality) Q_DECLARE_METATYPE(QMultimedia::EncodingQuality)
QT_END_HEADER QT_END_HEADER

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

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

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

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

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

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

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

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

58
src/multimedia/recording/qmediaencodersettings.cpp
View File

@@ -62,11 +62,11 @@ class QAudioEncoderSettingsPrivate : public QSharedData
public: public:
QAudioEncoderSettingsPrivate() : QAudioEncoderSettingsPrivate() :
isNull(true), isNull(true),
encodingMode(QtMultimedia::ConstantQualityEncoding), encodingMode(QMultimedia::ConstantQualityEncoding),
bitrate(-1), bitrate(-1),
sampleRate(-1), sampleRate(-1),
channels(-1), channels(-1),
quality(QtMultimedia::NormalQuality) quality(QMultimedia::NormalQuality)
{ {
} }
@@ -84,12 +84,12 @@ public:
} }
bool isNull; bool isNull;
QtMultimedia::EncodingMode encodingMode; QMultimedia::EncodingMode encodingMode;
QString codec; QString codec;
int bitrate; int bitrate;
int sampleRate; int sampleRate;
int channels; int channels;
QtMultimedia::EncodingQuality quality; QMultimedia::EncodingQuality quality;
QVariantMap encodingOptions; QVariantMap encodingOptions;
private: private:
@@ -199,9 +199,9 @@ bool QAudioEncoderSettings::isNull() const
/*! /*!
Returns the audio encoding mode. Returns the audio encoding mode.
\sa QtMultimedia::EncodingMode \sa QMultimedia::EncodingMode
*/ */
QtMultimedia::EncodingMode QAudioEncoderSettings::encodingMode() const QMultimedia::EncodingMode QAudioEncoderSettings::encodingMode() const
{ {
return d->encodingMode; return d->encodingMode;
} }
@@ -209,16 +209,16 @@ QtMultimedia::EncodingMode QAudioEncoderSettings::encodingMode() const
/*! /*!
Sets the audio encoding \a mode setting. Sets the audio encoding \a mode setting.
If QtMultimedia::ConstantQualityEncoding is set, the quality If QMultimedia::ConstantQualityEncoding is set, the quality
encoding parameter is used and bit rate is ignored, encoding parameter is used and bit rate is ignored,
otherwise the bitrate is used. otherwise the bitrate is used.
The audio codec, channels count and sample rate settings are used in all The audio codec, channels count and sample rate settings are used in all
the encoding modes. the encoding modes.
\sa encodingMode(), QtMultimedia::EncodingMode \sa encodingMode(), QMultimedia::EncodingMode
*/ */
void QAudioEncoderSettings::setEncodingMode(QtMultimedia::EncodingMode mode) void QAudioEncoderSettings::setEncodingMode(QMultimedia::EncodingMode mode)
{ {
d->encodingMode = mode; d->encodingMode = mode;
} }
@@ -301,7 +301,7 @@ void QAudioEncoderSettings::setSampleRate(int rate)
Returns the audio encoding quality. Returns the audio encoding quality.
*/ */
QtMultimedia::EncodingQuality QAudioEncoderSettings::quality() const QMultimedia::EncodingQuality QAudioEncoderSettings::quality() const
{ {
return d->quality; return d->quality;
} }
@@ -313,9 +313,9 @@ QtMultimedia::EncodingQuality QAudioEncoderSettings::quality() const
set of encoding parameters to achieve the desired quality level. set of encoding parameters to achieve the desired quality level.
The \a quality settings parameter is only used in the The \a quality settings parameter is only used in the
\l {QtMultimedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}. \l {QMultimedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
*/ */
void QAudioEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality) void QAudioEncoderSettings::setQuality(QMultimedia::EncodingQuality quality)
{ {
d->isNull = false; d->isNull = false;
d->quality = quality; d->quality = quality;
@@ -377,10 +377,10 @@ class QVideoEncoderSettingsPrivate : public QSharedData
public: public:
QVideoEncoderSettingsPrivate() : QVideoEncoderSettingsPrivate() :
isNull(true), isNull(true),
encodingMode(QtMultimedia::ConstantQualityEncoding), encodingMode(QMultimedia::ConstantQualityEncoding),
bitrate(-1), bitrate(-1),
frameRate(0), frameRate(0),
quality(QtMultimedia::NormalQuality) quality(QMultimedia::NormalQuality)
{ {
} }
@@ -398,12 +398,12 @@ public:
} }
bool isNull; bool isNull;
QtMultimedia::EncodingMode encodingMode; QMultimedia::EncodingMode encodingMode;
QString codec; QString codec;
int bitrate; int bitrate;
QSize resolution; QSize resolution;
qreal frameRate; qreal frameRate;
QtMultimedia::EncodingQuality quality; QMultimedia::EncodingQuality quality;
QVariantMap encodingOptions; QVariantMap encodingOptions;
private: private:
@@ -508,9 +508,9 @@ bool QVideoEncoderSettings::isNull() const
/*! /*!
Returns the video encoding mode. Returns the video encoding mode.
\sa QtMultimedia::EncodingMode \sa QMultimedia::EncodingMode
*/ */
QtMultimedia::EncodingMode QVideoEncoderSettings::encodingMode() const QMultimedia::EncodingMode QVideoEncoderSettings::encodingMode() const
{ {
return d->encodingMode; return d->encodingMode;
} }
@@ -518,15 +518,15 @@ QtMultimedia::EncodingMode QVideoEncoderSettings::encodingMode() const
/*! /*!
Sets the video encoding \a mode. Sets the video encoding \a mode.
If QtMultimedia::ConstantQualityEncoding is set, If QMultimedia::ConstantQualityEncoding is set,
the quality encoding parameter is used and bit rate is ignored, the quality encoding parameter is used and bit rate is ignored,
otherwise the bitrate is used. otherwise the bitrate is used.
The rest of encoding settings are respected regardless of encoding mode. The rest of encoding settings are respected regardless of encoding mode.
\sa QtMultimedia::EncodingMode \sa QMultimedia::EncodingMode
*/ */
void QVideoEncoderSettings::setEncodingMode(QtMultimedia::EncodingMode mode) void QVideoEncoderSettings::setEncodingMode(QMultimedia::EncodingMode mode)
{ {
d->isNull = false; d->isNull = false;
d->encodingMode = mode; d->encodingMode = mode;
@@ -629,7 +629,7 @@ void QVideoEncoderSettings::setResolution(int width, int height)
Returns the video encoding quality. Returns the video encoding quality.
*/ */
QtMultimedia::EncodingQuality QVideoEncoderSettings::quality() const QMultimedia::EncodingQuality QVideoEncoderSettings::quality() const
{ {
return d->quality; return d->quality;
} }
@@ -641,13 +641,13 @@ QtMultimedia::EncodingQuality QVideoEncoderSettings::quality() const
set of encoding parameters to achieve the desired quality level. set of encoding parameters to achieve the desired quality level.
The \a quality settings parameter is only used in the The \a quality settings parameter is only used in the
\l {QtMultimedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}. \l {QMultimedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
The \a quality settings parameter is only used in the \l The \a quality settings parameter is only used in the \l
{QtMultimedia::ConstantQualityEncoding}{constant quality} {QMultimedia::ConstantQualityEncoding}{constant quality}
\l{encodingMode()}{encoding mode}. \l{encodingMode()}{encoding mode}.
*/ */
void QVideoEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality) void QVideoEncoderSettings::setQuality(QMultimedia::EncodingQuality quality)
{ {
d->isNull = false; d->isNull = false;
d->quality = quality; d->quality = quality;
@@ -710,7 +710,7 @@ class QImageEncoderSettingsPrivate : public QSharedData
public: public:
QImageEncoderSettingsPrivate() : QImageEncoderSettingsPrivate() :
isNull(true), isNull(true),
quality(QtMultimedia::NormalQuality) quality(QMultimedia::NormalQuality)
{ {
} }
@@ -727,7 +727,7 @@ public:
bool isNull; bool isNull;
QString codec; QString codec;
QSize resolution; QSize resolution;
QtMultimedia::EncodingQuality quality; QMultimedia::EncodingQuality quality;
QVariantMap encodingOptions; QVariantMap encodingOptions;
private: private:
@@ -887,7 +887,7 @@ void QImageEncoderSettings::setResolution(int width, int height)
Returns the image encoding quality. Returns the image encoding quality.
*/ */
QtMultimedia::EncodingQuality QImageEncoderSettings::quality() const QMultimedia::EncodingQuality QImageEncoderSettings::quality() const
{ {
return d->quality; return d->quality;
} }
@@ -896,7 +896,7 @@ QtMultimedia::EncodingQuality QImageEncoderSettings::quality() const
Sets the image encoding \a quality. Sets the image encoding \a quality.
*/ */
void QImageEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality) void QImageEncoderSettings::setQuality(QMultimedia::EncodingQuality quality)
{ {
d->isNull = false; d->isNull = false;
d->quality = quality; d->quality = quality;

20
src/multimedia/recording/qmediaencodersettings.h
View File

@@ -70,8 +70,8 @@ public:
bool isNull() const; bool isNull() const;
QtMultimedia::EncodingMode encodingMode() const; QMultimedia::EncodingMode encodingMode() const;
void setEncodingMode(QtMultimedia::EncodingMode); void setEncodingMode(QMultimedia::EncodingMode);
QString codec() const; QString codec() const;
void setCodec(const QString& codec); void setCodec(const QString& codec);
@@ -85,8 +85,8 @@ public:
int sampleRate() const; int sampleRate() const;
void setSampleRate(int rate); void setSampleRate(int rate);
QtMultimedia::EncodingQuality quality() const; QMultimedia::EncodingQuality quality() const;
void setQuality(QtMultimedia::EncodingQuality quality); void setQuality(QMultimedia::EncodingQuality quality);
QVariant encodingOption(const QString &option) const; QVariant encodingOption(const QString &option) const;
QVariantMap encodingOptions() const; QVariantMap encodingOptions() const;
@@ -112,8 +112,8 @@ public:
bool isNull() const; bool isNull() const;
QtMultimedia::EncodingMode encodingMode() const; QMultimedia::EncodingMode encodingMode() const;
void setEncodingMode(QtMultimedia::EncodingMode); void setEncodingMode(QMultimedia::EncodingMode);
QString codec() const; QString codec() const;
void setCodec(const QString &); void setCodec(const QString &);
@@ -128,8 +128,8 @@ public:
int bitRate() const; int bitRate() const;
void setBitRate(int bitrate); void setBitRate(int bitrate);
QtMultimedia::EncodingQuality quality() const; QMultimedia::EncodingQuality quality() const;
void setQuality(QtMultimedia::EncodingQuality quality); void setQuality(QMultimedia::EncodingQuality quality);
QVariant encodingOption(const QString &option) const; QVariant encodingOption(const QString &option) const;
QVariantMap encodingOptions() const; QVariantMap encodingOptions() const;
@@ -162,8 +162,8 @@ public:
void setResolution(const QSize &); void setResolution(const QSize &);
void setResolution(int width, int height); void setResolution(int width, int height);
QtMultimedia::EncodingQuality quality() const; QMultimedia::EncodingQuality quality() const;
void setQuality(QtMultimedia::EncodingQuality quality); void setQuality(QMultimedia::EncodingQuality quality);
QVariant encodingOption(const QString &option) const; QVariant encodingOption(const QString &option) const;
QVariantMap encodingOptions() const; QVariantMap encodingOptions() const;

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

@@ -185,7 +185,7 @@ void QMediaRecorderPrivate::_q_applySettings()
} }
} }
void QMediaRecorderPrivate::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability) void QMediaRecorderPrivate::_q_availabilityChanged(QMultimedia::AvailabilityStatus availability)
{ {
Q_Q(QMediaRecorder); Q_Q(QMediaRecorder);
Q_UNUSED(error) Q_UNUSED(error)
@@ -327,8 +327,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
service->releaseControl(d->metaDataControl); service->releaseControl(d->metaDataControl);
} }
if (d->availabilityControl) { if (d->availabilityControl) {
disconnect(d->availabilityControl, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), disconnect(d->availabilityControl, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)),
this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus)));
service->releaseControl(d->availabilityControl); service->releaseControl(d->availabilityControl);
} }
} }
@@ -379,8 +379,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
d->availabilityControl = service->requestControl<QMediaAvailabilityControl*>(); d->availabilityControl = service->requestControl<QMediaAvailabilityControl*>();
if (d->availabilityControl) { if (d->availabilityControl) {
connect(d->availabilityControl, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), connect(d->availabilityControl, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)),
this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus)));
} }
connect(d->control, SIGNAL(stateChanged(QMediaRecorder::State)), connect(d->control, SIGNAL(stateChanged(QMediaRecorder::State)),
@@ -449,7 +449,7 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
*/ */
bool QMediaRecorder::isAvailable() const bool QMediaRecorder::isAvailable() const
{ {
return availability() == QtMultimedia::Available; return availability() == QMultimedia::Available;
} }
/*! /*!
@@ -457,15 +457,15 @@ bool QMediaRecorder::isAvailable() const
\sa availabilityChanged() \sa availabilityChanged()
*/ */
QtMultimedia::AvailabilityStatus QMediaRecorder::availability() const QMultimedia::AvailabilityStatus QMediaRecorder::availability() const
{ {
if (d_func()->control == NULL) if (d_func()->control == NULL)
return QtMultimedia::ServiceMissing; return QMultimedia::ServiceMissing;
if (d_func()->availabilityControl) if (d_func()->availabilityControl)
return d_func()->availabilityControl->availability(); return d_func()->availabilityControl->availability();
return QtMultimedia::Available; return QMultimedia::Available;
} }
QUrl QMediaRecorder::outputLocation() const QUrl QMediaRecorder::outputLocation() const
@@ -987,7 +987,7 @@ void QMediaRecorder::stop()
*/ */
/*! /*!
\fn QMediaRecorder::availabilityChanged(QtMultimedia::AvailabilityStatus availability) \fn QMediaRecorder::availabilityChanged(QMultimedia::AvailabilityStatus availability)
Signals that the service availability has changed to \a availability. Signals that the service availability has changed to \a availability.
*/ */

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

@@ -116,7 +116,7 @@ public:
QMediaObject *mediaObject() const; QMediaObject *mediaObject() const;
bool isAvailable() const; bool isAvailable() const;
QtMultimedia::AvailabilityStatus availability() const; QMultimedia::AvailabilityStatus availability() const;
QUrl outputLocation() const; QUrl outputLocation() const;
bool setOutputLocation(const QUrl &location); bool setOutputLocation(const QUrl &location);
@@ -194,7 +194,7 @@ Q_SIGNALS:
void metaDataChanged(const QString &key, const QVariant &value); void metaDataChanged(const QString &key, const QVariant &value);
void availabilityChanged(bool available); void availabilityChanged(bool available);
void availabilityChanged(QtMultimedia::AvailabilityStatus availability); void availabilityChanged(QMultimedia::AvailabilityStatus availability);
protected: protected:
QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = 0); QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = 0);
@@ -211,7 +211,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_updateActualLocation(const QUrl &)) 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_updateNotifyInterval(int))
Q_PRIVATE_SLOT(d_func(), void _q_applySettings()) Q_PRIVATE_SLOT(d_func(), void _q_applySettings())
Q_PRIVATE_SLOT(d_func(), void _q_availabilityChanged(QtMultimedia::AvailabilityStatus)) Q_PRIVATE_SLOT(d_func(), void _q_availabilityChanged(QMultimedia::AvailabilityStatus))
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

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

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

10
src/plugins/audiocapture/audioencodercontrol.cpp
View File

@@ -60,12 +60,12 @@ AudioEncoderControl::AudioEncoderControl(QObject *parent)
fmt.setByteOrder(QAudioFormat::LittleEndian); fmt.setByteOrder(QAudioFormat::LittleEndian);
m_session->setFormat(fmt); m_session->setFormat(fmt);
m_settings.setEncodingMode(QtMultimedia::ConstantQualityEncoding); m_settings.setEncodingMode(QMultimedia::ConstantQualityEncoding);
m_settings.setCodec("audio/pcm"); m_settings.setCodec("audio/pcm");
m_settings.setBitRate(8000); m_settings.setBitRate(8000);
m_settings.setChannelCount(1); m_settings.setChannelCount(1);
m_settings.setSampleRate(8000); m_settings.setSampleRate(8000);
m_settings.setQuality(QtMultimedia::LowQuality); m_settings.setQuality(QMultimedia::LowQuality);
} }
AudioEncoderControl::~AudioEncoderControl() AudioEncoderControl::~AudioEncoderControl()
@@ -106,14 +106,14 @@ void AudioEncoderControl::setAudioSettings(const QAudioEncoderSettings &settings
{ {
QAudioFormat fmt = m_session->format(); QAudioFormat fmt = m_session->format();
if (settings.encodingMode() == QtMultimedia::ConstantQualityEncoding) { if (settings.encodingMode() == QMultimedia::ConstantQualityEncoding) {
if (settings.quality() == QtMultimedia::LowQuality) { if (settings.quality() == QMultimedia::LowQuality) {
fmt.setSampleSize(8); fmt.setSampleSize(8);
fmt.setChannelCount(1); fmt.setChannelCount(1);
fmt.setSampleRate(8000); fmt.setSampleRate(8000);
fmt.setSampleType(QAudioFormat::UnSignedInt); fmt.setSampleType(QAudioFormat::UnSignedInt);
} else if (settings.quality() == QtMultimedia::NormalQuality) { } else if (settings.quality() == QMultimedia::NormalQuality) {
fmt.setSampleSize(16); fmt.setSampleSize(16);
fmt.setChannelCount(1); fmt.setChannelCount(1);
fmt.setSampleRate(22050); fmt.setSampleRate(22050);

2
src/plugins/avfoundation/mediaplayer/avfmediaplayerserviceplugin.h
View File

@@ -65,7 +65,7 @@ public:
void release(QMediaService *service); void release(QMediaService *service);
QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const; QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const;
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const; QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
QStringList supportedMimeTypes() const; QStringList supportedMimeTypes() const;
private: private:

6
src/plugins/avfoundation/mediaplayer/avfmediaplayerserviceplugin.mm
View File

@@ -78,14 +78,14 @@ QMediaServiceProviderHint::Features AVFMediaPlayerServicePlugin::supportedFeatur
return QMediaServiceProviderHint::Features(); return QMediaServiceProviderHint::Features();
} }
QtMultimedia::SupportEstimate AVFMediaPlayerServicePlugin::hasSupport(const QString &mimeType, const QStringList &codecs) const QMultimedia::SupportEstimate AVFMediaPlayerServicePlugin::hasSupport(const QString &mimeType, const QStringList &codecs) const
{ {
Q_UNUSED(codecs); Q_UNUSED(codecs);
if (m_supportedMimeTypes.contains(mimeType)) if (m_supportedMimeTypes.contains(mimeType))
return QtMultimedia::ProbablySupported; return QMultimedia::ProbablySupported;
return QtMultimedia::MaybeSupported; return QMultimedia::MaybeSupported;
} }
QStringList AVFMediaPlayerServicePlugin::supportedMimeTypes() const QStringList AVFMediaPlayerServicePlugin::supportedMimeTypes() const

2
src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.cpp
View File

@@ -80,7 +80,7 @@ void QGstreamerAudioDecoderServicePlugin::release(QMediaService *service)
delete service; delete service;
} }
QtMultimedia::SupportEstimate QGstreamerAudioDecoderServicePlugin::hasSupport(const QString &mimeType, QMultimedia::SupportEstimate QGstreamerAudioDecoderServicePlugin::hasSupport(const QString &mimeType,
const QStringList &codecs) const const QStringList &codecs) const
{ {
if (m_supportedMimeTypeSet.isEmpty()) if (m_supportedMimeTypeSet.isEmpty())

2
src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.h
View File

@@ -60,7 +60,7 @@ public:
QMediaService* create(QString const& key); QMediaService* create(QString const& key);
void release(QMediaService *service); void release(QMediaService *service);
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const; QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
QStringList supportedMimeTypes() const; QStringList supportedMimeTypes() const;
private: private:

4
src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
View File

@@ -199,8 +199,8 @@ GstElement *QGstreamerAudioEncode::createEncoder()
} }
if (encoderElement) { if (encoderElement) {
if (m_audioSettings.encodingMode() == QtMultimedia::ConstantQualityEncoding) { if (m_audioSettings.encodingMode() == QMultimedia::ConstantQualityEncoding) {
QtMultimedia::EncodingQuality qualityValue = m_audioSettings.quality(); QMultimedia::EncodingQuality qualityValue = m_audioSettings.quality();
if (codec == QLatin1String("audio/vorbis")) { if (codec == QLatin1String("audio/vorbis")) {
double qualityTable[] = { double qualityTable[] = {

2
src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp
View File

@@ -177,7 +177,7 @@ void QGstreamerCaptureServicePlugin::updateDevices() const
} }
#endif #endif
QtMultimedia::SupportEstimate QGstreamerCaptureServicePlugin::hasSupport(const QString &mimeType, QMultimedia::SupportEstimate QGstreamerCaptureServicePlugin::hasSupport(const QString &mimeType,
const QStringList& codecs) const const QStringList& codecs) const
{ {
if (m_supportedMimeTypeSet.isEmpty()) if (m_supportedMimeTypeSet.isEmpty())

2
src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h
View File

@@ -80,7 +80,7 @@ public:
QVariant deviceProperty(const QByteArray &service, const QByteArray &device, const QByteArray &property); QVariant deviceProperty(const QByteArray &service, const QByteArray &device, const QByteArray &property);
#endif #endif
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const; QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
QStringList supportedMimeTypes() const; QStringList supportedMimeTypes() const;
private: private:

4
src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
View File

@@ -171,8 +171,8 @@ GstElement *QGstreamerVideoEncode::createEncoder()
gst_object_unref(GST_OBJECT(pad)); gst_object_unref(GST_OBJECT(pad));
if (encoderElement) { if (encoderElement) {
if (m_videoSettings.encodingMode() == QtMultimedia::ConstantQualityEncoding) { if (m_videoSettings.encodingMode() == QMultimedia::ConstantQualityEncoding) {
QtMultimedia::EncodingQuality qualityValue = m_videoSettings.quality(); QMultimedia::EncodingQuality qualityValue = m_videoSettings.quality();
if (codec == QLatin1String("video/h264")) { if (codec == QLatin1String("video/h264")) {
//constant quantizer mode //constant quantizer mode

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

@@ -58,9 +58,9 @@ void QGStreamerAvailabilityControl::handleAvailabilityChanged()
emit availabilityChanged(this->availability()); emit availabilityChanged(this->availability());
} }
QtMultimedia::AvailabilityStatus QGStreamerAvailabilityControl::availability() const QMultimedia::AvailabilityStatus QGStreamerAvailabilityControl::availability() const
{ {
return m_resources->isAvailable() ? QtMultimedia::Available : QtMultimedia::Busy; return m_resources->isAvailable() ? QMultimedia::Available : QMultimedia::Busy;
} }
QT_END_NAMESPACE QT_END_NAMESPACE

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

@@ -53,7 +53,7 @@ class QGStreamerAvailabilityControl : public QMediaAvailabilityControl
Q_OBJECT Q_OBJECT
public: public:
QGStreamerAvailabilityControl(QMediaPlayerResourceSetInterface *resources, QObject *parent = 0); QGStreamerAvailabilityControl(QMediaPlayerResourceSetInterface *resources, QObject *parent = 0);
QtMultimedia::AvailabilityStatus availability() const; QMultimedia::AvailabilityStatus availability() const;
private Q_SLOTS: private Q_SLOTS:
void handleAvailabilityChanged(); void handleAvailabilityChanged();

2
src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp
View File

@@ -94,7 +94,7 @@ QMediaServiceProviderHint::Features QGstreamerPlayerServicePlugin::supportedFeat
return QMediaServiceProviderHint::Features(); return QMediaServiceProviderHint::Features();
} }
QtMultimedia::SupportEstimate QGstreamerPlayerServicePlugin::hasSupport(const QString &mimeType, QMultimedia::SupportEstimate QGstreamerPlayerServicePlugin::hasSupport(const QString &mimeType,
const QStringList &codecs) const const QStringList &codecs) const
{ {
if (m_supportedMimeTypeSet.isEmpty()) if (m_supportedMimeTypeSet.isEmpty())

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

@@ -65,7 +65,7 @@ public:
QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const; QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const;
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const; QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
QStringList supportedMimeTypes() const; QStringList supportedMimeTypes() const;
private: private:

2
src/plugins/qt7/qt7serviceplugin.h
View File

@@ -63,7 +63,7 @@ public:
void release(QMediaService *service); void release(QMediaService *service);
QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const; QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const;
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const; QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
QStringList supportedMimeTypes() const; QStringList supportedMimeTypes() const;
private: private:

6
src/plugins/qt7/qt7serviceplugin.mm
View File

@@ -87,14 +87,14 @@ QMediaServiceProviderHint::Features QT7ServicePlugin::supportedFeatures(
return QMediaServiceProviderHint::Features(); return QMediaServiceProviderHint::Features();
} }
QtMultimedia::SupportEstimate QT7ServicePlugin::hasSupport(const QString &mimeType, const QStringList& codecs) const QMultimedia::SupportEstimate QT7ServicePlugin::hasSupport(const QString &mimeType, const QStringList& codecs) const
{ {
Q_UNUSED(codecs); Q_UNUSED(codecs);
if (m_supportedMimeTypes.contains(mimeType)) if (m_supportedMimeTypes.contains(mimeType))
return QtMultimedia::ProbablySupported; return QMultimedia::ProbablySupported;
return QtMultimedia::MaybeSupported; return QMultimedia::MaybeSupported;
} }
QStringList QT7ServicePlugin::supportedMimeTypes() const QStringList QT7ServicePlugin::supportedMimeTypes() const

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

@@ -88,12 +88,12 @@ bool V4LRadioControl::isAvailable() const
return available; return available;
} }
QtMultimedia::AvailabilityStatus V4LRadioControl::availability() const QMultimedia::AvailabilityStatus V4LRadioControl::availability() const
{ {
if (fd > 0) if (fd > 0)
return QtMultimedia::Available; return QMultimedia::Available;
else else
return QtMultimedia::ResourceError; return QMultimedia::ResourceError;
} }
QRadioTuner::State V4LRadioControl::state() const QRadioTuner::State V4LRadioControl::state() const

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

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

4
tests/auto/unit/qaudiodecoder/tst_qaudiodecoder.cpp
View File

@@ -348,7 +348,7 @@ void tst_QAudioDecoder::nullControl()
QVERIFY(d.error() == QAudioDecoder::ServiceMissingError); QVERIFY(d.error() == QAudioDecoder::ServiceMissingError);
QVERIFY(!d.errorString().isEmpty()); QVERIFY(!d.errorString().isEmpty());
QVERIFY(d.hasSupport("MIME") == QtMultimedia::MaybeSupported); QVERIFY(d.hasSupport("MIME") == QMultimedia::MaybeSupported);
QVERIFY(d.state() == QAudioDecoder::StoppedState); QVERIFY(d.state() == QAudioDecoder::StoppedState);
@@ -389,7 +389,7 @@ void tst_QAudioDecoder::nullService()
QVERIFY(d.error() == QAudioDecoder::ServiceMissingError); QVERIFY(d.error() == QAudioDecoder::ServiceMissingError);
QVERIFY(!d.errorString().isEmpty()); QVERIFY(!d.errorString().isEmpty());
QVERIFY(d.hasSupport("MIME") == QtMultimedia::MaybeSupported); QVERIFY(d.hasSupport("MIME") == QMultimedia::MaybeSupported);
QVERIFY(d.state() == QAudioDecoder::StoppedState); QVERIFY(d.state() == QAudioDecoder::StoppedState);

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

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

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

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

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

@@ -778,9 +778,9 @@ void tst_QCamera::testImageSettings()
QVERIFY(settings != QImageEncoderSettings()); QVERIFY(settings != QImageEncoderSettings());
settings = QImageEncoderSettings(); settings = QImageEncoderSettings();
QCOMPARE(settings.quality(), QtMultimedia::NormalQuality); QCOMPARE(settings.quality(), QMultimedia::NormalQuality);
settings.setQuality(QtMultimedia::HighQuality); settings.setQuality(QMultimedia::HighQuality);
QCOMPARE(settings.quality(), QtMultimedia::HighQuality); QCOMPARE(settings.quality(), QMultimedia::HighQuality);
QVERIFY(!settings.isNull()); QVERIFY(!settings.isNull());
settings = QImageEncoderSettings(); settings = QImageEncoderSettings();
@@ -808,7 +808,7 @@ void tst_QCamera::testImageSettings()
settings = QImageEncoderSettings(); settings = QImageEncoderSettings();
QVERIFY(settings.isNull()); QVERIFY(settings.isNull());
QCOMPARE(settings.codec(), QString()); QCOMPARE(settings.codec(), QString());
QCOMPARE(settings.quality(), QtMultimedia::NormalQuality); QCOMPARE(settings.quality(), QMultimedia::NormalQuality);
QCOMPARE(settings.resolution(), QSize()); QCOMPARE(settings.resolution(), QSize());
QVERIFY(settings.encodingOptions().isEmpty()); QVERIFY(settings.encodingOptions().isEmpty());
@@ -821,7 +821,7 @@ void tst_QCamera::testImageSettings()
QCOMPARE(settings2, settings1); QCOMPARE(settings2, settings1);
QVERIFY(settings2.isNull()); QVERIFY(settings2.isNull());
settings1.setQuality(QtMultimedia::HighQuality); settings1.setQuality(QMultimedia::HighQuality);
QVERIFY(settings2.isNull()); QVERIFY(settings2.isNull());
QVERIFY(!settings1.isNull()); QVERIFY(!settings1.isNull());
@@ -837,7 +837,7 @@ void tst_QCamera::testImageSettings()
QCOMPARE(settings2, settings1); QCOMPARE(settings2, settings1);
QVERIFY(settings2.isNull()); QVERIFY(settings2.isNull());
settings1.setQuality(QtMultimedia::HighQuality); settings1.setQuality(QMultimedia::HighQuality);
QVERIFY(settings2.isNull()); QVERIFY(settings2.isNull());
QVERIFY(!settings1.isNull()); QVERIFY(!settings1.isNull());
@@ -864,11 +864,11 @@ void tst_QCamera::testImageSettings()
QVERIFY(settings1 != settings2); QVERIFY(settings1 != settings2);
settings1 = QImageEncoderSettings(); settings1 = QImageEncoderSettings();
settings1.setQuality(QtMultimedia::NormalQuality); settings1.setQuality(QMultimedia::NormalQuality);
settings2 = QImageEncoderSettings(); settings2 = QImageEncoderSettings();
settings2.setQuality(QtMultimedia::NormalQuality); settings2.setQuality(QMultimedia::NormalQuality);
QVERIFY(settings1 == settings2); QVERIFY(settings1 == settings2);
settings2.setQuality(QtMultimedia::LowQuality); settings2.setQuality(QMultimedia::LowQuality);
QVERIFY(settings1 != settings2); QVERIFY(settings1 != settings2);
settings1 = QImageEncoderSettings(); settings1 = QImageEncoderSettings();
@@ -1233,7 +1233,7 @@ void tst_QCamera::testQCameraIsAvailable()
{ {
QCamera camera; QCamera camera;
QVERIFY(camera.isAvailable()); QVERIFY(camera.isAvailable());
QVERIFY(camera.availability() == QtMultimedia::Available); QVERIFY(camera.availability() == QMultimedia::Available);
} }
void tst_QCamera::testQCameraIsNotAvailable() void tst_QCamera::testQCameraIsNotAvailable()
@@ -1243,7 +1243,7 @@ void tst_QCamera::testQCameraIsNotAvailable()
QCOMPARE(camera.error(), QCamera::ServiceMissingError); QCOMPARE(camera.error(), QCamera::ServiceMissingError);
QVERIFY(!camera.isAvailable()); QVERIFY(!camera.isAvailable());
QCOMPARE(camera.availability(), QtMultimedia::ServiceMissing); QCOMPARE(camera.availability(), QMultimedia::ServiceMissing);
} }
/* Test case for searchAndLock ( QCamera::LockTypes locks ) */ /* Test case for searchAndLock ( QCamera::LockTypes locks ) */

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

@@ -260,11 +260,11 @@ void tst_QCameraImageCapture::encodingSettings()
QVERIFY(imageCapture.encodingSettings() == QImageEncoderSettings()); QVERIFY(imageCapture.encodingSettings() == QImageEncoderSettings());
QImageEncoderSettings settings; QImageEncoderSettings settings;
settings.setCodec("JPEG"); settings.setCodec("JPEG");
settings.setQuality(QtMultimedia::NormalQuality); settings.setQuality(QMultimedia::NormalQuality);
imageCapture.setEncodingSettings(settings); imageCapture.setEncodingSettings(settings);
QVERIFY(!imageCapture.encodingSettings().isNull()); QVERIFY(!imageCapture.encodingSettings().isNull());
QVERIFY(imageCapture.encodingSettings().codec() == "JPEG"); QVERIFY(imageCapture.encodingSettings().codec() == "JPEG");
QVERIFY(imageCapture.encodingSettings().quality() == QtMultimedia::NormalQuality); QVERIFY(imageCapture.encodingSettings().quality() == QMultimedia::NormalQuality);
} }
//MaemoAPI-1838:test supportedImageCodecs //MaemoAPI-1838:test supportedImageCodecs
@@ -312,7 +312,7 @@ void tst_QCameraImageCapture::errors()
imageCapture1.capture(QString::fromLatin1("/dev/null")); imageCapture1.capture(QString::fromLatin1("/dev/null"));
QVERIFY(imageCapture1.error() == QCameraImageCapture::NotSupportedFeatureError); QVERIFY(imageCapture1.error() == QCameraImageCapture::NotSupportedFeatureError);
QVERIFY2(!imageCapture1.errorString().isEmpty(), "Device does not support images capture"); QVERIFY2(!imageCapture1.errorString().isEmpty(), "Device does not support images capture");
QVERIFY(imageCapture1.availability() == QtMultimedia::ServiceMissing); QVERIFY(imageCapture1.availability() == QMultimedia::ServiceMissing);
provider->service = mockcameraservice; provider->service = mockcameraservice;
@@ -321,12 +321,12 @@ void tst_QCameraImageCapture::errors()
QVERIFY(imageCapture.isAvailable() == true); QVERIFY(imageCapture.isAvailable() == true);
QVERIFY(imageCapture.error() == QCameraImageCapture::NoError); QVERIFY(imageCapture.error() == QCameraImageCapture::NoError);
QVERIFY(imageCapture.errorString().isEmpty()); QVERIFY(imageCapture.errorString().isEmpty());
QVERIFY(imageCapture.availability() == QtMultimedia::Available); QVERIFY(imageCapture.availability() == QMultimedia::Available);
imageCapture.capture(); imageCapture.capture();
QVERIFY(imageCapture.error() == QCameraImageCapture::NotReadyError); QVERIFY(imageCapture.error() == QCameraImageCapture::NotReadyError);
QVERIFY2(!imageCapture.errorString().isEmpty(), "Could not capture in stopped state"); QVERIFY2(!imageCapture.errorString().isEmpty(), "Could not capture in stopped state");
QVERIFY(imageCapture.availability() == QtMultimedia::Available); QVERIFY(imageCapture.availability() == QMultimedia::Available);
} }
//MaemoAPI-1831:test error //MaemoAPI-1831:test error

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

@@ -441,52 +441,52 @@ void tst_QMediaObject::availability()
{ {
QtTestMediaObject nullObject(0); QtTestMediaObject nullObject(0);
QCOMPARE(nullObject.isAvailable(), false); QCOMPARE(nullObject.isAvailable(), false);
QCOMPARE(nullObject.availability(), QtMultimedia::ServiceMissing); QCOMPARE(nullObject.availability(), QMultimedia::ServiceMissing);
} }
{ {
QtTestMediaObjectService service; QtTestMediaObjectService service;
QtTestMediaObject object(&service); QtTestMediaObject object(&service);
QCOMPARE(object.isAvailable(), true); QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availability(), QtMultimedia::Available); QCOMPARE(object.availability(), QMultimedia::Available);
} }
{ {
MockAvailabilityControl available(QtMultimedia::Available); MockAvailabilityControl available(QMultimedia::Available);
QtTestMediaObjectService service(0, &available); QtTestMediaObjectService service(0, &available);
QtTestMediaObject object(&service); QtTestMediaObject object(&service);
QSignalSpy availabilitySpy(&object, SIGNAL(availabilityChanged(bool))); QSignalSpy availabilitySpy(&object, SIGNAL(availabilityChanged(bool)));
QSignalSpy availabilityStatusSpy(&object, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus))); QSignalSpy availabilityStatusSpy(&object, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)));
QCOMPARE(object.isAvailable(), true); QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availability(), QtMultimedia::Available); QCOMPARE(object.availability(), QMultimedia::Available);
available.setAvailability(QtMultimedia::Busy); available.setAvailability(QMultimedia::Busy);
QCOMPARE(object.isAvailable(), false); QCOMPARE(object.isAvailable(), false);
QCOMPARE(object.availability(), QtMultimedia::Busy); QCOMPARE(object.availability(), QMultimedia::Busy);
QCOMPARE(availabilitySpy.count(), 1); QCOMPARE(availabilitySpy.count(), 1);
QCOMPARE(availabilityStatusSpy.count(), 1); QCOMPARE(availabilityStatusSpy.count(), 1);
available.setAvailability(QtMultimedia::Available); available.setAvailability(QMultimedia::Available);
QCOMPARE(object.isAvailable(), true); QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availability(), QtMultimedia::Available); QCOMPARE(object.availability(), QMultimedia::Available);
QCOMPARE(availabilitySpy.count(), 2); QCOMPARE(availabilitySpy.count(), 2);
QCOMPARE(availabilityStatusSpy.count(), 2); QCOMPARE(availabilityStatusSpy.count(), 2);
} }
{ {
MockAvailabilityControl available(QtMultimedia::Busy); MockAvailabilityControl available(QMultimedia::Busy);
QtTestMediaObjectService service(0, &available); QtTestMediaObjectService service(0, &available);
QtTestMediaObject object(&service); QtTestMediaObject object(&service);
QSignalSpy availabilitySpy(&object, SIGNAL(availabilityChanged(bool))); QSignalSpy availabilitySpy(&object, SIGNAL(availabilityChanged(bool)));
QSignalSpy availabilityStatusSpy(&object, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus))); QSignalSpy availabilityStatusSpy(&object, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)));
QCOMPARE(object.isAvailable(), false); QCOMPARE(object.isAvailable(), false);
QCOMPARE(object.availability(), QtMultimedia::Busy); QCOMPARE(object.availability(), QMultimedia::Busy);
available.setAvailability(QtMultimedia::Available); available.setAvailability(QMultimedia::Available);
QCOMPARE(object.isAvailable(), true); QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availability(), QtMultimedia::Available); QCOMPARE(object.availability(), QMultimedia::Available);
QCOMPARE(availabilitySpy.count(), 1); QCOMPARE(availabilitySpy.count(), 1);
QCOMPARE(availabilityStatusSpy.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.playbackRate(), qreal(0));
QCOMPARE(player.error(), QMediaPlayer::ServiceMissingError); QCOMPARE(player.error(), QMediaPlayer::ServiceMissingError);
QCOMPARE(player.isAvailable(), false); QCOMPARE(player.isAvailable(), false);
QCOMPARE(player.availability(), QtMultimedia::ServiceMissing); QCOMPARE(player.availability(), QMultimedia::ServiceMissing);
{ {
QFETCH_GLOBAL(QMediaContent, mediaContent); QFETCH_GLOBAL(QMediaContent, mediaContent);
@@ -501,7 +501,7 @@ void tst_QMediaPlayer::testErrorString()
void tst_QMediaPlayer::testIsAvailable() void tst_QMediaPlayer::testIsAvailable()
{ {
QCOMPARE(player->isAvailable(), true); QCOMPARE(player->isAvailable(), true);
QCOMPARE(player->availability(), QtMultimedia::Available); QCOMPARE(player->availability(), QMultimedia::Available);
} }
void tst_QMediaPlayer::testService() void tst_QMediaPlayer::testService()

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

@@ -215,7 +215,7 @@ void tst_QMediaRecorder::testNullControls()
QAudioEncoderSettings audio; QAudioEncoderSettings audio;
audio.setCodec(id); audio.setCodec(id);
audio.setQuality(QtMultimedia::LowQuality); audio.setQuality(QMultimedia::LowQuality);
QVideoEncoderSettings video; QVideoEncoderSettings video;
video.setCodec(id); video.setCodec(id);
@@ -447,18 +447,18 @@ void tst_QMediaRecorder::testEncodingSettings()
QCOMPARE(audioSettings.codec(), QString("audio/pcm")); QCOMPARE(audioSettings.codec(), QString("audio/pcm"));
QCOMPARE(audioSettings.bitRate(), 128*1024); QCOMPARE(audioSettings.bitRate(), 128*1024);
QCOMPARE(audioSettings.sampleRate(), 8000); QCOMPARE(audioSettings.sampleRate(), 8000);
QCOMPARE(audioSettings.quality(), QtMultimedia::NormalQuality); QCOMPARE(audioSettings.quality(), QMultimedia::NormalQuality);
QCOMPARE(audioSettings.channelCount(), -1); QCOMPARE(audioSettings.channelCount(), -1);
QCOMPARE(audioSettings.encodingMode(), QtMultimedia::ConstantQualityEncoding); QCOMPARE(audioSettings.encodingMode(), QMultimedia::ConstantQualityEncoding);
QVideoEncoderSettings videoSettings = capture->videoSettings(); QVideoEncoderSettings videoSettings = capture->videoSettings();
QCOMPARE(videoSettings.codec(), QString()); QCOMPARE(videoSettings.codec(), QString());
QCOMPARE(videoSettings.bitRate(), -1); QCOMPARE(videoSettings.bitRate(), -1);
QCOMPARE(videoSettings.resolution(), QSize()); QCOMPARE(videoSettings.resolution(), QSize());
QCOMPARE(videoSettings.frameRate(), 0.0); QCOMPARE(videoSettings.frameRate(), 0.0);
QCOMPARE(videoSettings.quality(), QtMultimedia::NormalQuality); QCOMPARE(videoSettings.quality(), QMultimedia::NormalQuality);
QCOMPARE(videoSettings.encodingMode(), QtMultimedia::ConstantQualityEncoding); QCOMPARE(videoSettings.encodingMode(), QMultimedia::ConstantQualityEncoding);
QString format = capture->containerFormat(); QString format = capture->containerFormat();
QCOMPARE(format, QString()); QCOMPARE(format, QString());
@@ -466,15 +466,15 @@ void tst_QMediaRecorder::testEncodingSettings()
audioSettings.setCodec("audio/mpeg"); audioSettings.setCodec("audio/mpeg");
audioSettings.setSampleRate(44100); audioSettings.setSampleRate(44100);
audioSettings.setBitRate(256*1024); audioSettings.setBitRate(256*1024);
audioSettings.setQuality(QtMultimedia::HighQuality); audioSettings.setQuality(QMultimedia::HighQuality);
audioSettings.setEncodingMode(QtMultimedia::AverageBitRateEncoding); audioSettings.setEncodingMode(QMultimedia::AverageBitRateEncoding);
videoSettings.setCodec("video/3gpp"); videoSettings.setCodec("video/3gpp");
videoSettings.setBitRate(800); videoSettings.setBitRate(800);
videoSettings.setFrameRate(24*1024); videoSettings.setFrameRate(24*1024);
videoSettings.setResolution(QSize(800,600)); videoSettings.setResolution(QSize(800,600));
videoSettings.setQuality(QtMultimedia::HighQuality); videoSettings.setQuality(QMultimedia::HighQuality);
audioSettings.setEncodingMode(QtMultimedia::TwoPassEncoding); audioSettings.setEncodingMode(QMultimedia::TwoPassEncoding);
format = QString("mov"); format = QString("mov");
@@ -506,9 +506,9 @@ void tst_QMediaRecorder::testAudioSettings()
QVERIFY(!settings.isNull()); QVERIFY(!settings.isNull());
settings = QAudioEncoderSettings(); settings = QAudioEncoderSettings();
QCOMPARE(settings.quality(), QtMultimedia::NormalQuality); QCOMPARE(settings.quality(), QMultimedia::NormalQuality);
settings.setQuality(QtMultimedia::HighQuality); settings.setQuality(QMultimedia::HighQuality);
QCOMPARE(settings.quality(), QtMultimedia::HighQuality); QCOMPARE(settings.quality(), QMultimedia::HighQuality);
QVERIFY(!settings.isNull()); QVERIFY(!settings.isNull());
settings = QAudioEncoderSettings(); settings = QAudioEncoderSettings();
@@ -541,7 +541,7 @@ void tst_QMediaRecorder::testAudioSettings()
QVERIFY(settings.isNull()); QVERIFY(settings.isNull());
QCOMPARE(settings.codec(), QString()); QCOMPARE(settings.codec(), QString());
QCOMPARE(settings.bitRate(), -1); QCOMPARE(settings.bitRate(), -1);
QCOMPARE(settings.quality(), QtMultimedia::NormalQuality); QCOMPARE(settings.quality(), QMultimedia::NormalQuality);
QCOMPARE(settings.sampleRate(), -1); QCOMPARE(settings.sampleRate(), -1);
QVERIFY(settings.encodingOptions().isEmpty()); QVERIFY(settings.encodingOptions().isEmpty());
@@ -554,7 +554,7 @@ void tst_QMediaRecorder::testAudioSettings()
QCOMPARE(settings2, settings1); QCOMPARE(settings2, settings1);
QVERIFY(settings2.isNull()); QVERIFY(settings2.isNull());
settings1.setQuality(QtMultimedia::HighQuality); settings1.setQuality(QMultimedia::HighQuality);
QVERIFY(settings2.isNull()); QVERIFY(settings2.isNull());
QVERIFY(!settings1.isNull()); QVERIFY(!settings1.isNull());
@@ -570,7 +570,7 @@ void tst_QMediaRecorder::testAudioSettings()
QCOMPARE(settings2, settings1); QCOMPARE(settings2, settings1);
QVERIFY(settings2.isNull()); QVERIFY(settings2.isNull());
settings1.setQuality(QtMultimedia::HighQuality); settings1.setQuality(QMultimedia::HighQuality);
QVERIFY(settings2.isNull()); QVERIFY(settings2.isNull());
QVERIFY(!settings1.isNull()); QVERIFY(!settings1.isNull());
@@ -602,19 +602,19 @@ void tst_QMediaRecorder::testAudioSettings()
QVERIFY(settings1 != settings2); QVERIFY(settings1 != settings2);
settings1 = QAudioEncoderSettings(); settings1 = QAudioEncoderSettings();
settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); settings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
settings2 = QAudioEncoderSettings(); settings2 = QAudioEncoderSettings();
settings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); settings2.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
QVERIFY(settings1 == settings2); QVERIFY(settings1 == settings2);
settings2.setEncodingMode(QtMultimedia::TwoPassEncoding); settings2.setEncodingMode(QMultimedia::TwoPassEncoding);
QVERIFY(settings1 != settings2); QVERIFY(settings1 != settings2);
settings1 = QAudioEncoderSettings(); settings1 = QAudioEncoderSettings();
settings1.setQuality(QtMultimedia::NormalQuality); settings1.setQuality(QMultimedia::NormalQuality);
settings2 = QAudioEncoderSettings(); settings2 = QAudioEncoderSettings();
settings2.setQuality(QtMultimedia::NormalQuality); settings2.setQuality(QMultimedia::NormalQuality);
QVERIFY(settings1 == settings2); QVERIFY(settings1 == settings2);
settings2.setQuality(QtMultimedia::LowQuality); settings2.setQuality(QMultimedia::LowQuality);
QVERIFY(settings1 != settings2); QVERIFY(settings1 != settings2);
settings1 = QAudioEncoderSettings(); settings1 = QAudioEncoderSettings();
@@ -653,9 +653,9 @@ void tst_QMediaRecorder::testVideoSettings()
QVERIFY(!settings.isNull()); QVERIFY(!settings.isNull());
settings = QVideoEncoderSettings(); settings = QVideoEncoderSettings();
QCOMPARE(settings.quality(), QtMultimedia::NormalQuality); QCOMPARE(settings.quality(), QMultimedia::NormalQuality);
settings.setQuality(QtMultimedia::HighQuality); settings.setQuality(QMultimedia::HighQuality);
QCOMPARE(settings.quality(), QtMultimedia::HighQuality); QCOMPARE(settings.quality(), QMultimedia::HighQuality);
QVERIFY(!settings.isNull()); QVERIFY(!settings.isNull());
settings = QVideoEncoderSettings(); settings = QVideoEncoderSettings();
@@ -692,7 +692,7 @@ void tst_QMediaRecorder::testVideoSettings()
QVERIFY(settings.isNull()); QVERIFY(settings.isNull());
QCOMPARE(settings.codec(), QString()); QCOMPARE(settings.codec(), QString());
QCOMPARE(settings.bitRate(), -1); QCOMPARE(settings.bitRate(), -1);
QCOMPARE(settings.quality(), QtMultimedia::NormalQuality); QCOMPARE(settings.quality(), QMultimedia::NormalQuality);
QCOMPARE(settings.frameRate(), qreal()); QCOMPARE(settings.frameRate(), qreal());
QCOMPARE(settings.resolution(), QSize()); QCOMPARE(settings.resolution(), QSize());
QVERIFY(settings.encodingOptions().isEmpty()); QVERIFY(settings.encodingOptions().isEmpty());
@@ -706,7 +706,7 @@ void tst_QMediaRecorder::testVideoSettings()
QCOMPARE(settings2, settings1); QCOMPARE(settings2, settings1);
QVERIFY(settings2.isNull()); QVERIFY(settings2.isNull());
settings1.setQuality(QtMultimedia::HighQuality); settings1.setQuality(QMultimedia::HighQuality);
QVERIFY(settings2.isNull()); QVERIFY(settings2.isNull());
QVERIFY(!settings1.isNull()); QVERIFY(!settings1.isNull());
@@ -722,7 +722,7 @@ void tst_QMediaRecorder::testVideoSettings()
QCOMPARE(settings2, settings1); QCOMPARE(settings2, settings1);
QVERIFY(settings2.isNull()); QVERIFY(settings2.isNull());
settings1.setQuality(QtMultimedia::HighQuality); settings1.setQuality(QMultimedia::HighQuality);
QVERIFY(settings2.isNull()); QVERIFY(settings2.isNull());
QVERIFY(!settings1.isNull()); QVERIFY(!settings1.isNull());
@@ -754,19 +754,19 @@ void tst_QMediaRecorder::testVideoSettings()
QVERIFY(settings1 != settings2); QVERIFY(settings1 != settings2);
settings1 = QVideoEncoderSettings(); settings1 = QVideoEncoderSettings();
settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); settings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
settings2 = QVideoEncoderSettings(); settings2 = QVideoEncoderSettings();
settings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); settings2.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
QVERIFY(settings1 == settings2); QVERIFY(settings1 == settings2);
settings2.setEncodingMode(QtMultimedia::TwoPassEncoding); settings2.setEncodingMode(QMultimedia::TwoPassEncoding);
QVERIFY(settings1 != settings2); QVERIFY(settings1 != settings2);
settings1 = QVideoEncoderSettings(); settings1 = QVideoEncoderSettings();
settings1.setQuality(QtMultimedia::NormalQuality); settings1.setQuality(QMultimedia::NormalQuality);
settings2 = QVideoEncoderSettings(); settings2 = QVideoEncoderSettings();
settings2.setQuality(QtMultimedia::NormalQuality); settings2.setQuality(QMultimedia::NormalQuality);
QVERIFY(settings1 == settings2); QVERIFY(settings1 == settings2);
settings2.setQuality(QtMultimedia::LowQuality); settings2.setQuality(QMultimedia::LowQuality);
QVERIFY(settings1 != settings2); QVERIFY(settings1 != settings2);
settings1 = QVideoEncoderSettings(); settings1 = QVideoEncoderSettings();
@@ -803,7 +803,7 @@ void tst_QMediaRecorder::testSettingsApplied()
recorder.setVideoSettings(videoSettings); recorder.setVideoSettings(videoSettings);
QAudioEncoderSettings audioSettings; QAudioEncoderSettings audioSettings;
audioSettings.setQuality(QtMultimedia::HighQuality); audioSettings.setQuality(QMultimedia::HighQuality);
recorder.setAudioSettings(audioSettings); recorder.setAudioSettings(audioSettings);
recorder.setContainerFormat("mkv"); recorder.setContainerFormat("mkv");
@@ -812,7 +812,7 @@ void tst_QMediaRecorder::testSettingsApplied()
QTRY_COMPARE(recorderControl.m_settingAppliedCount, 2); QTRY_COMPARE(recorderControl.m_settingAppliedCount, 2);
//encoder settings are applied before recording if changed //encoder settings are applied before recording if changed
audioSettings.setQuality(QtMultimedia::VeryHighQuality); audioSettings.setQuality(QMultimedia::VeryHighQuality);
recorder.setAudioSettings(audioSettings); recorder.setAudioSettings(audioSettings);
QCOMPARE(recorderControl.m_settingAppliedCount, 2); QCOMPARE(recorderControl.m_settingAppliedCount, 2);
@@ -1010,8 +1010,8 @@ void tst_QMediaRecorder::testAudioSettingsCopyConstructor()
audiosettings.setBitRate(128*1000); audiosettings.setBitRate(128*1000);
audiosettings.setChannelCount(4); audiosettings.setChannelCount(4);
audiosettings.setCodec("audio/pcm"); audiosettings.setCodec("audio/pcm");
audiosettings.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); audiosettings.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
audiosettings.setQuality(QtMultimedia::LowQuality); audiosettings.setQuality(QMultimedia::LowQuality);
audiosettings.setSampleRate(44100); audiosettings.setSampleRate(44100);
/* Copy constructor */ /* Copy constructor */
@@ -1040,16 +1040,16 @@ void tst_QMediaRecorder::testAudioSettingsOperatorNotEqual()
audiosettings1.setBitRate(128*1000); audiosettings1.setBitRate(128*1000);
audiosettings1.setChannelCount(4); audiosettings1.setChannelCount(4);
audiosettings1.setCodec("audio/pcm"); audiosettings1.setCodec("audio/pcm");
audiosettings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); audiosettings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
audiosettings1.setQuality(QtMultimedia::LowQuality); audiosettings1.setQuality(QMultimedia::LowQuality);
audiosettings1.setSampleRate(44100); audiosettings1.setSampleRate(44100);
/* setting the desired properties for the AudioEncoder */ /* setting the desired properties for the AudioEncoder */
audiosettings2.setBitRate(128*1000); audiosettings2.setBitRate(128*1000);
audiosettings2.setChannelCount(4); audiosettings2.setChannelCount(4);
audiosettings2.setCodec("audio/pcm"); audiosettings2.setCodec("audio/pcm");
audiosettings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); audiosettings2.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
audiosettings2.setQuality(QtMultimedia::LowQuality); audiosettings2.setQuality(QMultimedia::LowQuality);
audiosettings2.setSampleRate(44100); audiosettings2.setSampleRate(44100);
/* verify the both are equal or not */ /* verify the both are equal or not */
@@ -1057,7 +1057,7 @@ void tst_QMediaRecorder::testAudioSettingsOperatorNotEqual()
/* Modify the settings value for one object */ /* Modify the settings value for one object */
audiosettings2.setBitRate(64*1000); audiosettings2.setBitRate(64*1000);
audiosettings2.setEncodingMode(QtMultimedia::ConstantQualityEncoding); audiosettings2.setEncodingMode(QMultimedia::ConstantQualityEncoding);
/* verify the not equal opertor */ /* verify the not equal opertor */
QVERIFY(audiosettings1 != audiosettings2); QVERIFY(audiosettings1 != audiosettings2);
@@ -1076,8 +1076,8 @@ void tst_QMediaRecorder::testAudioSettingsOperatorEqual()
audiosettings1.setBitRate(128*1000); audiosettings1.setBitRate(128*1000);
audiosettings1.setChannelCount(4); audiosettings1.setChannelCount(4);
audiosettings1.setCodec("audio/pcm"); audiosettings1.setCodec("audio/pcm");
audiosettings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); audiosettings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
audiosettings1.setQuality(QtMultimedia::LowQuality); audiosettings1.setQuality(QMultimedia::LowQuality);
audiosettings1.setSampleRate(44100); audiosettings1.setSampleRate(44100);
QAudioEncoderSettings audiosettings2; QAudioEncoderSettings audiosettings2;
@@ -1087,8 +1087,8 @@ void tst_QMediaRecorder::testAudioSettingsOperatorEqual()
audiosettings2.setBitRate(128*1000); audiosettings2.setBitRate(128*1000);
audiosettings2.setChannelCount(4); audiosettings2.setChannelCount(4);
audiosettings2.setCodec("audio/pcm"); audiosettings2.setCodec("audio/pcm");
audiosettings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); audiosettings2.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
audiosettings2.setQuality(QtMultimedia::LowQuality); audiosettings2.setQuality(QMultimedia::LowQuality);
audiosettings2.setSampleRate(44100); audiosettings2.setSampleRate(44100);
/* verify both the values are same or not */ /* verify both the values are same or not */
@@ -1108,8 +1108,8 @@ void tst_QMediaRecorder::testAudioSettingsOperatorAssign()
audiosettings1.setBitRate(128*1000); audiosettings1.setBitRate(128*1000);
audiosettings1.setChannelCount(4); audiosettings1.setChannelCount(4);
audiosettings1.setCodec("audio/pcm"); audiosettings1.setCodec("audio/pcm");
audiosettings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); audiosettings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
audiosettings1.setQuality(QtMultimedia::LowQuality); audiosettings1.setQuality(QMultimedia::LowQuality);
audiosettings1.setSampleRate(44100); audiosettings1.setSampleRate(44100);
QAudioEncoderSettings audiosettings2; QAudioEncoderSettings audiosettings2;
@@ -1141,7 +1141,7 @@ void tst_QMediaRecorder::testAvailabilityStatus()
MockMediaRecorderService service(0, 0); MockMediaRecorderService service(0, 0);
MockMediaObject object(0, &service); MockMediaObject object(0, &service);
QMediaRecorder recorder(&object); QMediaRecorder recorder(&object);
QCOMPARE(recorder.availability(), QtMultimedia::ServiceMissing); QCOMPARE(recorder.availability(), QMultimedia::ServiceMissing);
QCOMPARE(recorder.isAvailable(), false); QCOMPARE(recorder.isAvailable(), false);
} }
{ {
@@ -1150,7 +1150,7 @@ void tst_QMediaRecorder::testAvailabilityStatus()
service1.mockMetaDataControl->populateMetaData(); service1.mockMetaDataControl->populateMetaData();
MockMediaObject object1(0, &service1); MockMediaObject object1(0, &service1);
QMediaRecorder recorder1(&object1); QMediaRecorder recorder1(&object1);
QCOMPARE(recorder1.availability(), QtMultimedia::Available); QCOMPARE(recorder1.availability(), QMultimedia::Available);
QCOMPARE(recorder1.isAvailable(), true); QCOMPARE(recorder1.isAvailable(), true);
} }
{ {
@@ -1160,29 +1160,29 @@ void tst_QMediaRecorder::testAvailabilityStatus()
MockMediaObject object1(0, &service1); MockMediaObject object1(0, &service1);
QMediaRecorder recorder1(&object1); QMediaRecorder recorder1(&object1);
QCOMPARE(recorder1.availability(), QtMultimedia::Available); QCOMPARE(recorder1.availability(), QMultimedia::Available);
QCOMPARE(recorder1.isAvailable(), true); QCOMPARE(recorder1.isAvailable(), true);
} }
{ {
MockMediaRecorderControl recorderControl(0); MockMediaRecorderControl recorderControl(0);
MockAvailabilityControl availability(QtMultimedia::Available); MockAvailabilityControl availability(QMultimedia::Available);
MockMediaRecorderService service1(0, &recorderControl, &availability); MockMediaRecorderService service1(0, &recorderControl, &availability);
service1.mockMetaDataControl->populateMetaData(); service1.mockMetaDataControl->populateMetaData();
MockMediaObject object1(0, &service1); MockMediaObject object1(0, &service1);
QMediaRecorder recorder1(&object1); QMediaRecorder recorder1(&object1);
QSignalSpy spy(&object1, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus))); QSignalSpy spy(&object1, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)));
QCOMPARE(recorder1.availability(), QtMultimedia::Available); QCOMPARE(recorder1.availability(), QMultimedia::Available);
QCOMPARE(recorder1.isAvailable(), true); QCOMPARE(recorder1.isAvailable(), true);
availability.setAvailability(QtMultimedia::Busy); availability.setAvailability(QMultimedia::Busy);
QCOMPARE(recorder1.availability(), QtMultimedia::Busy); QCOMPARE(recorder1.availability(), QMultimedia::Busy);
QCOMPARE(recorder1.isAvailable(), false); QCOMPARE(recorder1.isAvailable(), false);
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
availability.setAvailability(QtMultimedia::Available); availability.setAvailability(QMultimedia::Available);
QCOMPARE(recorder1.availability(), QtMultimedia::Available); QCOMPARE(recorder1.availability(), QMultimedia::Available);
QCOMPARE(recorder1.isAvailable(), true); QCOMPARE(recorder1.isAvailable(), true);
QCOMPARE(spy.count(), 2); QCOMPARE(spy.count(), 2);
} }
@@ -1246,21 +1246,21 @@ void tst_QMediaRecorder::testVideoSettingsQuality()
QVERIFY(settings == QVideoEncoderSettings()); QVERIFY(settings == QVideoEncoderSettings());
/* Verify the default value is intialised correctly*/ /* Verify the default value is intialised correctly*/
QCOMPARE(settings.quality(), QtMultimedia::NormalQuality); QCOMPARE(settings.quality(), QMultimedia::NormalQuality);
/* Set all types of Quality parameter and Verify if it is set correctly*/ /* Set all types of Quality parameter and Verify if it is set correctly*/
settings.setQuality(QtMultimedia::HighQuality); settings.setQuality(QMultimedia::HighQuality);
QCOMPARE(settings.quality(), QtMultimedia::HighQuality); QCOMPARE(settings.quality(), QMultimedia::HighQuality);
QVERIFY(!settings.isNull()); QVERIFY(!settings.isNull());
settings.setQuality(QtMultimedia::VeryLowQuality); settings.setQuality(QMultimedia::VeryLowQuality);
QCOMPARE(settings.quality(), QtMultimedia::VeryLowQuality); QCOMPARE(settings.quality(), QMultimedia::VeryLowQuality);
settings.setQuality(QtMultimedia::LowQuality); settings.setQuality(QMultimedia::LowQuality);
QCOMPARE(settings.quality(), QtMultimedia::LowQuality); QCOMPARE(settings.quality(), QMultimedia::LowQuality);
settings.setQuality(QtMultimedia::VeryHighQuality); settings.setQuality(QMultimedia::VeryHighQuality);
QCOMPARE(settings.quality(), QtMultimedia::VeryHighQuality); QCOMPARE(settings.quality(), QMultimedia::VeryHighQuality);
} }
/* Test QVideoEncoderSettings encodingMode */ /* Test QVideoEncoderSettings encodingMode */
@@ -1272,19 +1272,19 @@ void tst_QMediaRecorder::testVideoSettingsEncodingMode()
QVERIFY(settings == QVideoEncoderSettings()); QVERIFY(settings == QVideoEncoderSettings());
/* Verify the default values are initialised correctly*/ /* Verify the default values are initialised correctly*/
QCOMPARE(settings.encodingMode(), QtMultimedia::ConstantQualityEncoding); QCOMPARE(settings.encodingMode(), QMultimedia::ConstantQualityEncoding);
QVERIFY(settings.isNull()); QVERIFY(settings.isNull());
/* Set each type of encoding mode and Verify if it is set correctly*/ /* Set each type of encoding mode and Verify if it is set correctly*/
settings.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); settings.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
QCOMPARE(settings.encodingMode(),QtMultimedia::ConstantBitRateEncoding); QCOMPARE(settings.encodingMode(),QMultimedia::ConstantBitRateEncoding);
QVERIFY(!settings.isNull()); QVERIFY(!settings.isNull());
settings.setEncodingMode(QtMultimedia::AverageBitRateEncoding); settings.setEncodingMode(QMultimedia::AverageBitRateEncoding);
QCOMPARE(settings.encodingMode(), QtMultimedia::AverageBitRateEncoding); QCOMPARE(settings.encodingMode(), QMultimedia::AverageBitRateEncoding);
settings.setEncodingMode(QtMultimedia::TwoPassEncoding); settings.setEncodingMode(QMultimedia::TwoPassEncoding);
QCOMPARE(settings.encodingMode(), QtMultimedia::TwoPassEncoding); QCOMPARE(settings.encodingMode(), QMultimedia::TwoPassEncoding);
} }
/* Test QVideoEncoderSettings copy constructor */ /* Test QVideoEncoderSettings copy constructor */
@@ -1294,8 +1294,8 @@ void tst_QMediaRecorder::testVideoSettingsCopyConstructor()
QVideoEncoderSettings settings1; QVideoEncoderSettings settings1;
settings1.setCodec(QLatin1String("codecName")); settings1.setCodec(QLatin1String("codecName"));
settings1.setBitRate(128000); settings1.setBitRate(128000);
settings1.setQuality(QtMultimedia::HighQuality); settings1.setQuality(QMultimedia::HighQuality);
settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); settings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
settings1.setFrameRate(30000.0/10001); settings1.setFrameRate(30000.0/10001);
settings1.setResolution(QSize(320,240)); settings1.setResolution(QSize(320,240));
@@ -1306,10 +1306,10 @@ void tst_QMediaRecorder::testVideoSettingsCopyConstructor()
QCOMPARE(settings2 != settings1, false); QCOMPARE(settings2 != settings1, false);
QCOMPARE(settings2.codec(), QLatin1String("codecName")); QCOMPARE(settings2.codec(), QLatin1String("codecName"));
QCOMPARE(settings2.bitRate(), 128000); QCOMPARE(settings2.bitRate(), 128000);
QCOMPARE(settings2.encodingMode(), QtMultimedia::ConstantBitRateEncoding); QCOMPARE(settings2.encodingMode(), QMultimedia::ConstantBitRateEncoding);
QVERIFY(qFuzzyCompare(settings2.frameRate(), qreal(30000.0/10001))); QVERIFY(qFuzzyCompare(settings2.frameRate(), qreal(30000.0/10001)));
QCOMPARE(settings2.resolution(), QSize(320,240)); QCOMPARE(settings2.resolution(), QSize(320,240));
QCOMPARE(settings2.quality(), QtMultimedia::HighQuality); QCOMPARE(settings2.quality(), QMultimedia::HighQuality);
/* Verify both the instances are equal*/ /* Verify both the instances are equal*/
QCOMPARE(settings2, settings1); QCOMPARE(settings2, settings1);
@@ -1328,10 +1328,10 @@ void tst_QMediaRecorder::testVideoSettingsOperatorAssignment()
/* Initialize all the parameters */ /* Initialize all the parameters */
settings1.setCodec(QLatin1String("codecName")); settings1.setCodec(QLatin1String("codecName"));
settings1.setBitRate(128000); settings1.setBitRate(128000);
settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); settings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
settings1.setFrameRate(30000.0/10001); settings1.setFrameRate(30000.0/10001);
settings1.setResolution(QSize(320,240)); settings1.setResolution(QSize(320,240));
settings1.setQuality(QtMultimedia::HighQuality); settings1.setQuality(QMultimedia::HighQuality);
/* Assign one object to other*/ /* Assign one object to other*/
settings2 = settings1; settings2 = settings1;
@@ -1339,10 +1339,10 @@ void tst_QMediaRecorder::testVideoSettingsOperatorAssignment()
QCOMPARE(settings2, settings1); QCOMPARE(settings2, settings1);
QCOMPARE(settings2.codec(), QLatin1String("codecName")); QCOMPARE(settings2.codec(), QLatin1String("codecName"));
QCOMPARE(settings2.bitRate(), 128000); QCOMPARE(settings2.bitRate(), 128000);
QCOMPARE(settings2.encodingMode(), QtMultimedia::ConstantBitRateEncoding); QCOMPARE(settings2.encodingMode(), QMultimedia::ConstantBitRateEncoding);
QVERIFY(qFuzzyCompare(settings2.frameRate(), qreal(30000.0/10001))); QVERIFY(qFuzzyCompare(settings2.frameRate(), qreal(30000.0/10001)));
QCOMPARE(settings2.resolution(), QSize(320,240)); QCOMPARE(settings2.resolution(), QSize(320,240));
QCOMPARE(settings2.quality(), QtMultimedia::HighQuality); QCOMPARE(settings2.quality(), QMultimedia::HighQuality);
QCOMPARE(settings2, settings1); QCOMPARE(settings2, settings1);
QVERIFY(!settings2.isNull()); QVERIFY(!settings2.isNull());
} }
@@ -1385,23 +1385,23 @@ void tst_QMediaRecorder::testVideoSettingsOperatorNotEqual()
/* Verify EncodingMode with not equal operator*/ /* Verify EncodingMode with not equal operator*/
settings1 = QVideoEncoderSettings(); settings1 = QVideoEncoderSettings();
settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); settings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
settings2 = QVideoEncoderSettings(); settings2 = QVideoEncoderSettings();
settings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); settings2.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
/* OperatorNotEqual returns false when both objects are equal*/ /* OperatorNotEqual returns false when both objects are equal*/
QCOMPARE(settings1 != settings2, false); QCOMPARE(settings1 != settings2, false);
settings2.setEncodingMode(QtMultimedia::TwoPassEncoding); settings2.setEncodingMode(QMultimedia::TwoPassEncoding);
/* OperatorNotEqual returns true when both objects are not equal*/ /* OperatorNotEqual returns true when both objects are not equal*/
QVERIFY(settings1 != settings2); QVERIFY(settings1 != settings2);
/* Verify Quality with not equal operator*/ /* Verify Quality with not equal operator*/
settings1 = QVideoEncoderSettings(); settings1 = QVideoEncoderSettings();
settings1.setQuality(QtMultimedia::NormalQuality); settings1.setQuality(QMultimedia::NormalQuality);
settings2 = QVideoEncoderSettings(); settings2 = QVideoEncoderSettings();
settings2.setQuality(QtMultimedia::NormalQuality); settings2.setQuality(QMultimedia::NormalQuality);
/* OperatorNotEqual returns false when both objects are equal*/ /* OperatorNotEqual returns false when both objects are equal*/
QCOMPARE(settings1 != settings2, false); QCOMPARE(settings1 != settings2, false);
settings2.setQuality(QtMultimedia::LowQuality); settings2.setQuality(QMultimedia::LowQuality);
/* OperatorNotEqual returns true when both objects are not equal*/ /* OperatorNotEqual returns true when both objects are not equal*/
QVERIFY(settings1 != settings2); QVERIFY(settings1 != settings2);
@@ -1456,23 +1456,23 @@ void tst_QMediaRecorder::testVideoSettingsOperatorComparison()
/* Verify EncodingMode with comparison operator*/ /* Verify EncodingMode with comparison operator*/
settings1 = QVideoEncoderSettings(); settings1 = QVideoEncoderSettings();
settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); settings1.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
settings2 = QVideoEncoderSettings(); settings2 = QVideoEncoderSettings();
settings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding); settings2.setEncodingMode(QMultimedia::ConstantBitRateEncoding);
/* Comparison operator returns true when both objects are equal*/ /* Comparison operator returns true when both objects are equal*/
QVERIFY(settings1 == settings2); QVERIFY(settings1 == settings2);
settings2.setEncodingMode(QtMultimedia::TwoPassEncoding); settings2.setEncodingMode(QMultimedia::TwoPassEncoding);
/* Comparison operator returns false when both objects are not equal*/ /* Comparison operator returns false when both objects are not equal*/
QCOMPARE(settings1 == settings2, false); QCOMPARE(settings1 == settings2, false);
/* Verify Quality with comparison operator*/ /* Verify Quality with comparison operator*/
settings1 = QVideoEncoderSettings(); settings1 = QVideoEncoderSettings();
settings1.setQuality(QtMultimedia::NormalQuality); settings1.setQuality(QMultimedia::NormalQuality);
settings2 = QVideoEncoderSettings(); settings2 = QVideoEncoderSettings();
settings2.setQuality(QtMultimedia::NormalQuality); settings2.setQuality(QMultimedia::NormalQuality);
/* Comparison operator returns true when both objects are equal*/ /* Comparison operator returns true when both objects are equal*/
QVERIFY(settings1 == settings2); QVERIFY(settings1 == settings2);
settings2.setQuality(QtMultimedia::LowQuality); settings2.setQuality(QMultimedia::LowQuality);
/* Comparison operator returns false when both objects are not equal*/ /* Comparison operator returns false when both objects are not equal*/
QCOMPARE(settings1 == settings2, false); QCOMPARE(settings1 == settings2, false);

8
tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.cpp
View File

@@ -71,16 +71,16 @@ public:
delete service; delete service;
} }
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
{ {
if (codecs.contains(QLatin1String("mpeg4"))) if (codecs.contains(QLatin1String("mpeg4")))
return QtMultimedia::NotSupported; return QMultimedia::NotSupported;
if (mimeType == "audio/ogg") { if (mimeType == "audio/ogg") {
return QtMultimedia::ProbablySupported; return QMultimedia::ProbablySupported;
} }
return QtMultimedia::MaybeSupported; return QMultimedia::MaybeSupported;
} }
QStringList supportedMimeTypes() const QStringList supportedMimeTypes() const

6
tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp
View File

@@ -71,14 +71,14 @@ public:
delete service; delete service;
} }
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
{ {
Q_UNUSED(codecs); Q_UNUSED(codecs);
if (mimeType == "audio/wav") if (mimeType == "audio/wav")
return QtMultimedia::PreferredService; return QMultimedia::PreferredService;
return QtMultimedia::NotSupported; return QMultimedia::NotSupported;
} }
QStringList supportedMimeTypes() const QStringList supportedMimeTypes() const

8
tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp
View File

@@ -70,15 +70,15 @@ public:
delete service; delete service;
} }
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
{ {
if (codecs.contains(QLatin1String("jpeg2000"))) if (codecs.contains(QLatin1String("jpeg2000")))
return QtMultimedia::NotSupported; return QMultimedia::NotSupported;
if (supportedMimeTypes().contains(mimeType)) if (supportedMimeTypes().contains(mimeType))
return QtMultimedia::ProbablySupported; return QMultimedia::ProbablySupported;
return QtMultimedia::MaybeSupported; return QMultimedia::MaybeSupported;
} }
QStringList supportedMimeTypes() const QStringList supportedMimeTypes() const

28
tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
View File

@@ -119,7 +119,7 @@ void tst_QMediaServiceProvider::testHasSupport()
{ {
MockMediaServiceProvider mockProvider; MockMediaServiceProvider mockProvider;
QCOMPARE(mockProvider.hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()), QCOMPARE(mockProvider.hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()),
QtMultimedia::MaybeSupported); QMultimedia::MaybeSupported);
QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider(); QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider();
@@ -127,44 +127,44 @@ void tst_QMediaServiceProvider::testHasSupport()
QSKIP("No default provider"); QSKIP("No default provider");
QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()), QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()),
QtMultimedia::MaybeSupported); QMultimedia::MaybeSupported);
QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "audio/ogg", QStringList()), QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "audio/ogg", QStringList()),
QtMultimedia::ProbablySupported); QMultimedia::ProbablySupported);
//while the service returns PreferredService, provider should return ProbablySupported //while the service returns PreferredService, provider should return ProbablySupported
QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "audio/wav", QStringList()), QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "audio/wav", QStringList()),
QtMultimedia::ProbablySupported); QMultimedia::ProbablySupported);
//even while all the plugins with "hasSupport" returned NotSupported, //even while all the plugins with "hasSupport" returned NotSupported,
//MockServicePlugin3 has no "hasSupport" interface, so MaybeSupported //MockServicePlugin3 has no "hasSupport" interface, so MaybeSupported
QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/avi", QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/avi",
QStringList() << "mpeg4"), QStringList() << "mpeg4"),
QtMultimedia::MaybeSupported); QMultimedia::MaybeSupported);
QCOMPARE(provider->hasSupport(QByteArray("non existing service"), "video/ogv", QStringList()), QCOMPARE(provider->hasSupport(QByteArray("non existing service"), "video/ogv", QStringList()),
QtMultimedia::NotSupported); QMultimedia::NotSupported);
QCOMPARE(QMediaPlayer::hasSupport("video/ogv"), QtMultimedia::MaybeSupported); QCOMPARE(QMediaPlayer::hasSupport("video/ogv"), QMultimedia::MaybeSupported);
QCOMPARE(QMediaPlayer::hasSupport("audio/ogg"), QtMultimedia::ProbablySupported); QCOMPARE(QMediaPlayer::hasSupport("audio/ogg"), QMultimedia::ProbablySupported);
QCOMPARE(QMediaPlayer::hasSupport("audio/wav"), QtMultimedia::ProbablySupported); QCOMPARE(QMediaPlayer::hasSupport("audio/wav"), QMultimedia::ProbablySupported);
//test low latency flag support //test low latency flag support
QCOMPARE(QMediaPlayer::hasSupport("audio/wav", QStringList(), QMediaPlayer::LowLatency), QCOMPARE(QMediaPlayer::hasSupport("audio/wav", QStringList(), QMediaPlayer::LowLatency),
QtMultimedia::ProbablySupported); QMultimedia::ProbablySupported);
//plugin1 probably supports audio/ogg, it checked because it doesn't provide features iface //plugin1 probably supports audio/ogg, it checked because it doesn't provide features iface
QCOMPARE(QMediaPlayer::hasSupport("audio/ogg", QStringList(), QMediaPlayer::LowLatency), QCOMPARE(QMediaPlayer::hasSupport("audio/ogg", QStringList(), QMediaPlayer::LowLatency),
QtMultimedia::ProbablySupported); QMultimedia::ProbablySupported);
//Plugin4 is not checked here, sine it's known not support low latency //Plugin4 is not checked here, sine it's known not support low latency
QCOMPARE(QMediaPlayer::hasSupport("video/quicktime", QStringList(), QMediaPlayer::LowLatency), QCOMPARE(QMediaPlayer::hasSupport("video/quicktime", QStringList(), QMediaPlayer::LowLatency),
QtMultimedia::MaybeSupported); QMultimedia::MaybeSupported);
//test streaming flag support //test streaming flag support
QCOMPARE(QMediaPlayer::hasSupport("video/quicktime", QStringList(), QMediaPlayer::StreamPlayback), QCOMPARE(QMediaPlayer::hasSupport("video/quicktime", QStringList(), QMediaPlayer::StreamPlayback),
QtMultimedia::ProbablySupported); QMultimedia::ProbablySupported);
//Plugin2 is not checked here, sine it's known not support streaming //Plugin2 is not checked here, sine it's known not support streaming
QCOMPARE(QMediaPlayer::hasSupport("audio/wav", QStringList(), QMediaPlayer::StreamPlayback), QCOMPARE(QMediaPlayer::hasSupport("audio/wav", QStringList(), QMediaPlayer::StreamPlayback),
QtMultimedia::MaybeSupported); QMultimedia::MaybeSupported);
//ensure the correct media player plugin is chosen for mime type //ensure the correct media player plugin is chosen for mime type
QMediaPlayer simplePlayer(0, QMediaPlayer::LowLatency); QMediaPlayer simplePlayer(0, QMediaPlayer::LowLatency);

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

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

4
tests/auto/unit/qmultimedia_common/mockimageencodercontrol.h
View File

@@ -65,12 +65,12 @@ public:
settings.resolution() == QSize(320,240)) settings.resolution() == QSize(320,240))
resolutions << settings.resolution(); resolutions << settings.resolution();
if (settings.quality() == QtMultimedia::HighQuality && settings.resolution() == QSize(640,480)) if (settings.quality() == QMultimedia::HighQuality && settings.resolution() == QSize(640,480))
resolutions << settings.resolution(); resolutions << settings.resolution();
} else { } else {
resolutions << QSize(160, 120); resolutions << QSize(160, 120);
resolutions << QSize(320, 240); resolutions << QSize(320, 240);
if (settings.quality() == QtMultimedia::HighQuality) if (settings.quality() == QMultimedia::HighQuality)
resolutions << QSize(640, 480); resolutions << QSize(640, 480);
} }

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

@@ -89,7 +89,7 @@ void tst_QRadioData::initTestCase()
{ {
qRegisterMetaType<QRadioData::ProgramType>("QRadioData::ProgramType"); qRegisterMetaType<QRadioData::ProgramType>("QRadioData::ProgramType");
mockAvailability = new MockAvailabilityControl(QtMultimedia::Available); mockAvailability = new MockAvailabilityControl(QMultimedia::Available);
mockTuner = new MockRadioTunerControl(this); mockTuner = new MockRadioTunerControl(this);
mockData = new MockRadioDataControl(this); mockData = new MockRadioDataControl(this);
@@ -105,7 +105,7 @@ void tst_QRadioData::initTestCase()
radio = new QRadioTuner; radio = new QRadioTuner;
radioData = radio->radioData(); radioData = radio->radioData();
QVERIFY(radioData->availability() == QtMultimedia::Available); QVERIFY(radioData->availability() == QMultimedia::Available);
} }
void tst_QRadioData::cleanupTestCase() 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"); qRegisterMetaType<QRadioTuner::Band>("QRadioTuner::Band");
mock = new MockRadioTunerControl(this); mock = new MockRadioTunerControl(this);
mockAvailability = new MockAvailabilityControl(QtMultimedia::Available); mockAvailability = new MockAvailabilityControl(QMultimedia::Available);
QMap<QString, QMediaControl *> map; QMap<QString, QMediaControl *> map;
map.insert(QRadioTunerControl_iid, mock); map.insert(QRadioTunerControl_iid, mock);
@@ -108,13 +108,13 @@ void tst_QRadioTuner::initTestCase()
radio = new QRadioTuner; radio = new QRadioTuner;
QVERIFY(radio->service() != 0); QVERIFY(radio->service() != 0);
QVERIFY(radio->isAvailable()); QVERIFY(radio->isAvailable());
QVERIFY(radio->availability() == QtMultimedia::Available); QVERIFY(radio->availability() == QMultimedia::Available);
QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State))); QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State)));
QCOMPARE(radio->state(), QRadioTuner::StoppedState); QCOMPARE(radio->state(), QRadioTuner::StoppedState);
radio->start(); radio->start();
QVERIFY(radio->availability() == QtMultimedia::Available); QVERIFY(radio->availability() == QMultimedia::Available);
QCOMPARE(radio->state(), QRadioTuner::ActiveState); QCOMPARE(radio->state(), QRadioTuner::ActiveState);
QCOMPARE(stateSpy.count(), 1); QCOMPARE(stateSpy.count(), 1);
@@ -129,7 +129,7 @@ void tst_QRadioTuner::cleanupTestCase()
QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State))); QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State)));
radio->stop(); radio->stop();
QVERIFY(radio->availability() == QtMultimedia::Available); QVERIFY(radio->availability() == QMultimedia::Available);
QCOMPARE(radio->state(), QRadioTuner::StoppedState); QCOMPARE(radio->state(), QRadioTuner::StoppedState);
QCOMPARE(stateSpy.count(), 1); 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; player = new QMediaPlayer;
QVERIFY(!player->isAvailable()); QVERIFY(!player->isAvailable());
QCOMPARE(player->availability(), QtMultimedia::ServiceMissing); QCOMPARE(player->availability(), QMultimedia::ServiceMissing);
QVideoProbe probe; QVideoProbe probe;
QVERIFY(!probe.isActive()); QVERIFY(!probe.isActive());