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
src/plugins/audiocapture/audioencodercontrol.cpp
View File

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

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

@@ -65,7 +65,7 @@ public:
void release(QMediaService *service);
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;
private:

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

@@ -78,14 +78,14 @@ QMediaServiceProviderHint::Features AVFMediaPlayerServicePlugin::supportedFeatur
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);
if (m_supportedMimeTypes.contains(mimeType))
return QtMultimedia::ProbablySupported;
return QMultimedia::ProbablySupported;
return QtMultimedia::MaybeSupported;
return QMultimedia::MaybeSupported;
}
QStringList AVFMediaPlayerServicePlugin::supportedMimeTypes() const

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

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

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

@@ -60,7 +60,7 @@ public:
QMediaService* create(QString const& key);
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;
private:

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

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

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

@@ -177,7 +177,7 @@ void QGstreamerCaptureServicePlugin::updateDevices() const
}
#endif
QtMultimedia::SupportEstimate QGstreamerCaptureServicePlugin::hasSupport(const QString &mimeType,
QMultimedia::SupportEstimate QGstreamerCaptureServicePlugin::hasSupport(const QString &mimeType,
const QStringList& codecs) const
{
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);
#endif
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
QStringList supportedMimeTypes() const;
private:

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

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

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

@@ -58,9 +58,9 @@ void QGStreamerAvailabilityControl::handleAvailabilityChanged()
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

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

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

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

@@ -94,7 +94,7 @@ QMediaServiceProviderHint::Features QGstreamerPlayerServicePlugin::supportedFeat
return QMediaServiceProviderHint::Features();
}
QtMultimedia::SupportEstimate QGstreamerPlayerServicePlugin::hasSupport(const QString &mimeType,
QMultimedia::SupportEstimate QGstreamerPlayerServicePlugin::hasSupport(const QString &mimeType,
const QStringList &codecs) const
{
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;
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
QStringList supportedMimeTypes() const;
private:

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

@@ -63,7 +63,7 @@ public:
void release(QMediaService *service);
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;
private:

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

@@ -87,14 +87,14 @@ QMediaServiceProviderHint::Features QT7ServicePlugin::supportedFeatures(
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);
if (m_supportedMimeTypes.contains(mimeType))
return QtMultimedia::ProbablySupported;
return QMultimedia::ProbablySupported;
return QtMultimedia::MaybeSupported;
return QMultimedia::MaybeSupported;
}
QStringList QT7ServicePlugin::supportedMimeTypes() const

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

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

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

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