diff options
Diffstat (limited to 'src/multimedia')
28 files changed, 121 insertions, 124 deletions
diff --git a/src/multimedia/audio/qaudiodecoder.cpp b/src/multimedia/audio/qaudiodecoder.cpp index 79352860a..f1227a78a 100644 --- a/src/multimedia/audio/qaudiodecoder.cpp +++ b/src/multimedia/audio/qaudiodecoder.cpp @@ -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. */ -QtMultimedia::SupportEstimate QAudioDecoder::hasSupport(const QString &mimeType, +QMultimedia::SupportEstimate QAudioDecoder::hasSupport(const QString &mimeType, const QStringList& codecs) { return QMediaServiceProvider::defaultServiceProvider()->hasSupport(QByteArray(Q_MEDIASERVICE_AUDIODECODER), diff --git a/src/multimedia/audio/qaudiodecoder.h b/src/multimedia/audio/qaudiodecoder.h index bf6bde40c..00fe138fb 100644 --- a/src/multimedia/audio/qaudiodecoder.h +++ b/src/multimedia/audio/qaudiodecoder.h @@ -82,7 +82,7 @@ public: QAudioDecoder(QObject *parent = 0); ~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; diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index b9dad1346..1746d48ab 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -412,17 +412,17 @@ QCamera::~QCamera() /*! Returns the availability state of the camera service. */ -QtMultimedia::AvailabilityStatus QCamera::availability() const +QMultimedia::AvailabilityStatus QCamera::availability() const { Q_D(const QCamera); if (d->control == NULL) - return QtMultimedia::ServiceMissing; + return QMultimedia::ServiceMissing; if (d->deviceControl && d->deviceControl->deviceCount() == 0) - return QtMultimedia::ResourceError; + return QMultimedia::ResourceError; if (d->error != QCamera::NoError) - return QtMultimedia::ResourceError; + return QMultimedia::ResourceError; return QMediaObject::availability(); } diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index e25a7d942..7c654d9e0 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -150,7 +150,7 @@ public: static QList<QByteArray> availableDevices(); static QString deviceDescription(const QByteArray &device); - QtMultimedia::AvailabilityStatus availability() const; + QMultimedia::AvailabilityStatus availability() const; State state() const; Status status() const; diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp index cde8740f8..1fd8810fc 100644 --- a/src/multimedia/camera/qcameraimagecapture.cpp +++ b/src/multimedia/camera/qcameraimagecapture.cpp @@ -314,12 +314,12 @@ bool QCameraImageCapture::isAvailable() const /*! Returns the availability of this functionality. */ -QtMultimedia::AvailabilityStatus QCameraImageCapture::availability() const +QMultimedia::AvailabilityStatus QCameraImageCapture::availability() const { if (d_func()->control != NULL) - return QtMultimedia::Available; + return QMultimedia::Available; else - return QtMultimedia::ServiceMissing; + return QMultimedia::ServiceMissing; } /*! diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h index 8aefa7dff..cd363a896 100644 --- a/src/multimedia/camera/qcameraimagecapture.h +++ b/src/multimedia/camera/qcameraimagecapture.h @@ -95,7 +95,7 @@ public: ~QCameraImageCapture(); bool isAvailable() const; - QtMultimedia::AvailabilityStatus availability() const; + QMultimedia::AvailabilityStatus availability() const; QMediaObject *mediaObject() const; diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.cpp b/src/multimedia/controls/qmediaavailabilitycontrol.cpp index 92139ac36..0f522e978 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.cpp +++ b/src/multimedia/controls/qmediaavailabilitycontrol.cpp @@ -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. 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. */ diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h index 2cdc06196..ee1b642f0 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.h +++ b/src/multimedia/controls/qmediaavailabilitycontrol.h @@ -60,10 +60,10 @@ class Q_MULTIMEDIA_EXPORT QMediaAvailabilityControl : public QMediaControl public: ~QMediaAvailabilityControl(); - virtual QtMultimedia::AvailabilityStatus availability() const = 0; + virtual QMultimedia::AvailabilityStatus availability() const = 0; Q_SIGNALS: - void availabilityChanged(QtMultimedia::AvailabilityStatus availability); + void availabilityChanged(QMultimedia::AvailabilityStatus availability); protected: QMediaAvailabilityControl(QObject* parent = 0); diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/src/snippets/multimedia-snippets/media.cpp index 56b2afd2c..300ad392b 100644 --- a/src/multimedia/doc/src/snippets/multimedia-snippets/media.cpp +++ b/src/multimedia/doc/src/snippets/multimedia-snippets/media.cpp @@ -200,7 +200,7 @@ void MediaExample::MediaRecorder() QAudioEncoderSettings audioSettings; audioSettings.setCodec("audio/amr"); - audioSettings.setQuality(QtMultimedia::HighQuality); + audioSettings.setQuality(QMultimedia::HighQuality); recorder->setAudioSettings(audioSettings); @@ -216,7 +216,7 @@ void MediaExample::AudioRecorder() QAudioEncoderSettings audioSettings; audioSettings.setCodec("audio/amr"); - audioSettings.setQuality(QtMultimedia::HighQuality); + audioSettings.setQuality(QMultimedia::HighQuality); audioRecorder->setEncodingSettings(audioSettings); @@ -264,7 +264,7 @@ void MediaExample::AudioProbe() QAudioEncoderSettings audioSettings; audioSettings.setCodec("audio/amr"); - audioSettings.setQuality(QtMultimedia::HighQuality); + audioSettings.setQuality(QMultimedia::HighQuality); audioRecorder->setEncodingSettings(audioSettings); diff --git a/src/multimedia/gsttools_headers/qgstutils_p.h b/src/multimedia/gsttools_headers/qgstutils_p.h index a1b427d26..36637d829 100644 --- a/src/multimedia/gsttools_headers/qgstutils_p.h +++ b/src/multimedia/gsttools_headers/qgstutils_p.h @@ -73,7 +73,7 @@ namespace QGstUtils { QAudioFormat audioFormatForBuffer(GstBuffer *buffer); GstCaps *capsForAudioFormat(QAudioFormat format); void initializeGst(); - QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, + QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList &codecs, const QSet<QString> &supportedMimeTypeSet); } diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 2555deb4f..82c709b11 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -913,7 +913,7 @@ void QMediaPlayer::unbind(QObject *obj) The \a flags argument allows additional requirements such as performance indicators to be specified. */ -QtMultimedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType, +QMultimedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType, const QStringList& codecs, Flags flags) { @@ -1013,12 +1013,12 @@ void QMediaPlayer::setVideoOutput(QAbstractVideoSurface *surface) } /*! \reimp */ -QtMultimedia::AvailabilityStatus QMediaPlayer::availability() const +QMultimedia::AvailabilityStatus QMediaPlayer::availability() const { Q_D(const QMediaPlayer); if (!d->control) - return QtMultimedia::ServiceMissing; + return QMultimedia::ServiceMissing; return QMediaObject::availability(); } diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 787f2d3e4..ab8f214d3 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -124,7 +124,7 @@ public: QMediaPlayer(QObject *parent = 0, Flags flags = 0); ~QMediaPlayer(); - static QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, + static QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs = QStringList(), Flags flags = 0); static QStringList supportedMimeTypes(Flags flags = 0); @@ -159,7 +159,7 @@ public: QNetworkConfiguration currentNetworkConfiguration() const; - QtMultimedia::AvailabilityStatus availability() const; + QMultimedia::AvailabilityStatus availability() const; public Q_SLOTS: void play(); diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp index 249562203..d1cafbf66 100644 --- a/src/multimedia/qmediaobject.cpp +++ b/src/multimedia/qmediaobject.cpp @@ -121,15 +121,15 @@ QMediaObject::~QMediaObject() audio playback during a phone call or similar). */ -QtMultimedia::AvailabilityStatus QMediaObject::availability() const +QMultimedia::AvailabilityStatus QMediaObject::availability() const { if (d_func()->service == 0) - return QtMultimedia::ServiceMissing; + return QMultimedia::ServiceMissing; if (d_func()->availabilityControl) return d_func()->availabilityControl->availability(); - return QtMultimedia::Available; + return QMultimedia::Available; } /*! @@ -138,7 +138,7 @@ QtMultimedia::AvailabilityStatus QMediaObject::availability() 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*>(); if (d->availabilityControl) { connect(d->availabilityControl, - SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), + SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)), 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 */ diff --git a/src/multimedia/qmediaobject.h b/src/multimedia/qmediaobject.h index abfcff9dd..258b430ba 100644 --- a/src/multimedia/qmediaobject.h +++ b/src/multimedia/qmediaobject.h @@ -65,7 +65,7 @@ public: ~QMediaObject(); virtual bool isAvailable() const; - virtual QtMultimedia::AvailabilityStatus availability() const; + virtual QMultimedia::AvailabilityStatus availability() const; virtual QMediaService* service() const; @@ -88,7 +88,7 @@ Q_SIGNALS: void metaDataChanged(const QString &key, const QVariant &value); void availabilityChanged(bool available); - void availabilityChanged(QtMultimedia::AvailabilityStatus availability); + void availabilityChanged(QMultimedia::AvailabilityStatus availability); protected: QMediaObject(QObject *parent, QMediaService *service); diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp index 4b3b5c380..9d95fa5df 100644 --- a/src/multimedia/qmediaserviceprovider.cpp +++ b/src/multimedia/qmediaserviceprovider.cpp @@ -346,9 +346,9 @@ public: } break; case QMediaServiceProviderHint::ContentType: { - QtMultimedia::SupportEstimate estimate = QtMultimedia::NotSupported; + QMultimedia::SupportEstimate estimate = QMultimedia::NotSupported; foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) { - QtMultimedia::SupportEstimate currentEstimate = QtMultimedia::MaybeSupported; + QMultimedia::SupportEstimate currentEstimate = QMultimedia::MaybeSupported; QMediaServiceSupportedFormatsInterface *iface = qobject_cast<QMediaServiceSupportedFormatsInterface*>(currentPlugin); @@ -359,7 +359,7 @@ public: estimate = currentEstimate; plugin = currentPlugin; - if (currentEstimate == QtMultimedia::PreferredService) + if (currentEstimate == QMultimedia::PreferredService) break; } } @@ -390,7 +390,7 @@ public: } } - QtMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType, + QMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const @@ -398,10 +398,10 @@ public: QList<QObject*> instances = loader()->instances(QLatin1String(serviceType)); if (instances.isEmpty()) - return QtMultimedia::NotSupported; + return QMultimedia::NotSupported; bool allServicesProvideInterface = true; - QtMultimedia::SupportEstimate supportEstimate = QtMultimedia::NotSupported; + QMultimedia::SupportEstimate supportEstimate = QMultimedia::NotSupported; foreach(QObject *obj, instances) { QMediaServiceSupportedFormatsInterface *iface = @@ -435,12 +435,12 @@ public: } //don't return PreferredService - supportEstimate = qMin(supportEstimate, QtMultimedia::ProbablySupported); + supportEstimate = qMin(supportEstimate, QMultimedia::ProbablySupported); //Return NotSupported only if no services are available of serviceType //or all the services returned NotSupported, otherwise return at least MaybeSupported if (!allServicesProvideInterface) - supportEstimate = qMax(QtMultimedia::MaybeSupported, supportEstimate); + supportEstimate = qMax(QMultimedia::MaybeSupported, 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 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 identified in \a flags. */ -QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, +QMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const @@ -574,7 +574,7 @@ QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray Q_UNUSED(codecs); Q_UNUSED(flags); - return QtMultimedia::MaybeSupported; + return QMultimedia::MaybeSupported; } /*! diff --git a/src/multimedia/qmediaserviceprovider_p.h b/src/multimedia/qmediaserviceprovider_p.h index c79ca33ba..c0689efb2 100644 --- a/src/multimedia/qmediaserviceprovider_p.h +++ b/src/multimedia/qmediaserviceprovider_p.h @@ -63,7 +63,7 @@ public: virtual QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint = QMediaServiceProviderHint()) = 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 QStringList& codecs, int flags = 0) const; diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h index 611f7d896..d45c85899 100644 --- a/src/multimedia/qmediaserviceproviderplugin.h +++ b/src/multimedia/qmediaserviceproviderplugin.h @@ -124,7 +124,7 @@ class QString; struct Q_MULTIMEDIA_EXPORT 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; }; diff --git a/src/multimedia/qtmedianamespace.cpp b/src/multimedia/qtmedianamespace.cpp index 218d9c47c..4c6bb4682 100644 --- a/src/multimedia/qtmedianamespace.cpp +++ b/src/multimedia/qtmedianamespace.cpp @@ -30,7 +30,7 @@ QT_BEGIN_NAMESPACE /*! - \namespace QtMultimedia + \namespace QMultimedia \inheaderfile qtmedianamespace.h \ingroup multimedia \inmodule QtMultimedia @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE \ingroup multimedia \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: QMultimediaNamespacePrivateRegisterMetaTypes() { - qRegisterMetaType<QtMultimedia::AvailabilityStatus>(); - qRegisterMetaType<QtMultimedia::SupportEstimate>(); - qRegisterMetaType<QtMultimedia::EncodingMode>(); - qRegisterMetaType<QtMultimedia::EncodingQuality>(); + qRegisterMetaType<QMultimedia::AvailabilityStatus>(); + qRegisterMetaType<QMultimedia::SupportEstimate>(); + qRegisterMetaType<QMultimedia::EncodingMode>(); + qRegisterMetaType<QMultimedia::EncodingQuality>(); } } _registerMetaTypes; } /*! - \enum QtMultimedia::SupportEstimate + \enum QMultimedia::SupportEstimate 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. @@ -81,7 +81,7 @@ namespace */ /*! - \enum QtMultimedia::EncodingMode + \enum QMultimedia::EncodingMode Enumerates encoding modes. @@ -95,7 +95,7 @@ namespace */ /*! - \enum QtMultimedia::AvailabilityStatus + \enum QMultimedia::AvailabilityStatus Enumerates Service status errors. diff --git a/src/multimedia/qtmedianamespace.h b/src/multimedia/qtmedianamespace.h index 1a571cb9f..e7fdfb64b 100644 --- a/src/multimedia/qtmedianamespace.h +++ b/src/multimedia/qtmedianamespace.h @@ -53,10 +53,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -// Class forward declaration required for QDoc bug -class QString; - -namespace QtMultimedia +namespace QMultimedia { enum SupportEstimate { @@ -95,10 +92,10 @@ namespace QtMultimedia QT_END_NAMESPACE -Q_DECLARE_METATYPE(QtMultimedia::AvailabilityStatus) -Q_DECLARE_METATYPE(QtMultimedia::SupportEstimate) -Q_DECLARE_METATYPE(QtMultimedia::EncodingMode) -Q_DECLARE_METATYPE(QtMultimedia::EncodingQuality) +Q_DECLARE_METATYPE(QMultimedia::AvailabilityStatus) +Q_DECLARE_METATYPE(QMultimedia::SupportEstimate) +Q_DECLARE_METATYPE(QMultimedia::EncodingMode) +Q_DECLARE_METATYPE(QMultimedia::EncodingQuality) QT_END_HEADER diff --git a/src/multimedia/radio/qradiodata.cpp b/src/multimedia/radio/qradiodata.cpp index c8853cb94..f6d380826 100644 --- a/src/multimedia/radio/qradiodata.cpp +++ b/src/multimedia/radio/qradiodata.cpp @@ -228,15 +228,15 @@ bool QRadioData::setMediaObject(QMediaObject *mediaObject) Returns the availability of the radio data service. 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}. */ -QtMultimedia::AvailabilityStatus QRadioData::availability() const +QMultimedia::AvailabilityStatus QRadioData::availability() const { Q_D(const QRadioData); if (d->control == 0) - return QtMultimedia::ServiceMissing; + return QMultimedia::ServiceMissing; return d->mediaObject->availability(); } diff --git a/src/multimedia/radio/qradiodata.h b/src/multimedia/radio/qradiodata.h index 6c6b0f411..6d67bce23 100644 --- a/src/multimedia/radio/qradiodata.h +++ b/src/multimedia/radio/qradiodata.h @@ -89,7 +89,7 @@ public: QRadioData(QMediaObject *mediaObject, QObject *parent = 0); ~QRadioData(); - QtMultimedia::AvailabilityStatus availability() const; + QMultimedia::AvailabilityStatus availability() const; QMediaObject *mediaObject() const; diff --git a/src/multimedia/radio/qradiotuner.cpp b/src/multimedia/radio/qradiotuner.cpp index ad2bcc7e6..d9d9cb6bf 100644 --- a/src/multimedia/radio/qradiotuner.cpp +++ b/src/multimedia/radio/qradiotuner.cpp @@ -159,13 +159,13 @@ QRadioTuner::~QRadioTuner() /*! Returns the availability of the radio tuner. */ -QtMultimedia::AvailabilityStatus QRadioTuner::availability() const +QMultimedia::AvailabilityStatus QRadioTuner::availability() const { if (d_func()->control == 0) - return QtMultimedia::ServiceMissing; + return QMultimedia::ServiceMissing; if (!d_func()->control->isAntennaConnected()) - return QtMultimedia::ResourceError; + return QMultimedia::ResourceError; return QMediaObject::availability(); } diff --git a/src/multimedia/radio/qradiotuner.h b/src/multimedia/radio/qradiotuner.h index eda8bc86f..463cafd00 100644 --- a/src/multimedia/radio/qradiotuner.h +++ b/src/multimedia/radio/qradiotuner.h @@ -85,7 +85,7 @@ public: QRadioTuner(QObject *parent = 0); ~QRadioTuner(); - QtMultimedia::AvailabilityStatus availability() const; + QMultimedia::AvailabilityStatus availability() const; State state() const; diff --git a/src/multimedia/recording/qmediaencodersettings.cpp b/src/multimedia/recording/qmediaencodersettings.cpp index f481d861e..8f8287f4c 100644 --- a/src/multimedia/recording/qmediaencodersettings.cpp +++ b/src/multimedia/recording/qmediaencodersettings.cpp @@ -62,11 +62,11 @@ class QAudioEncoderSettingsPrivate : public QSharedData public: QAudioEncoderSettingsPrivate() : isNull(true), - encodingMode(QtMultimedia::ConstantQualityEncoding), + encodingMode(QMultimedia::ConstantQualityEncoding), bitrate(-1), sampleRate(-1), channels(-1), - quality(QtMultimedia::NormalQuality) + quality(QMultimedia::NormalQuality) { } @@ -84,12 +84,12 @@ public: } bool isNull; - QtMultimedia::EncodingMode encodingMode; + QMultimedia::EncodingMode encodingMode; QString codec; int bitrate; int sampleRate; int channels; - QtMultimedia::EncodingQuality quality; + QMultimedia::EncodingQuality quality; QVariantMap encodingOptions; private: @@ -199,9 +199,9 @@ bool QAudioEncoderSettings::isNull() const /*! Returns the audio encoding mode. - \sa QtMultimedia::EncodingMode + \sa QMultimedia::EncodingMode */ -QtMultimedia::EncodingMode QAudioEncoderSettings::encodingMode() const +QMultimedia::EncodingMode QAudioEncoderSettings::encodingMode() const { return d->encodingMode; } @@ -209,16 +209,16 @@ QtMultimedia::EncodingMode QAudioEncoderSettings::encodingMode() const /*! 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, otherwise the bitrate is used. The audio codec, channels count and sample rate settings are used in all 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; } @@ -301,7 +301,7 @@ void QAudioEncoderSettings::setSampleRate(int rate) Returns the audio encoding quality. */ -QtMultimedia::EncodingQuality QAudioEncoderSettings::quality() const +QMultimedia::EncodingQuality QAudioEncoderSettings::quality() const { return d->quality; } @@ -313,9 +313,9 @@ QtMultimedia::EncodingQuality QAudioEncoderSettings::quality() const set of encoding parameters to achieve the desired quality level. 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->quality = quality; @@ -377,10 +377,10 @@ class QVideoEncoderSettingsPrivate : public QSharedData public: QVideoEncoderSettingsPrivate() : isNull(true), - encodingMode(QtMultimedia::ConstantQualityEncoding), + encodingMode(QMultimedia::ConstantQualityEncoding), bitrate(-1), frameRate(0), - quality(QtMultimedia::NormalQuality) + quality(QMultimedia::NormalQuality) { } @@ -398,12 +398,12 @@ public: } bool isNull; - QtMultimedia::EncodingMode encodingMode; + QMultimedia::EncodingMode encodingMode; QString codec; int bitrate; QSize resolution; qreal frameRate; - QtMultimedia::EncodingQuality quality; + QMultimedia::EncodingQuality quality; QVariantMap encodingOptions; private: @@ -508,9 +508,9 @@ bool QVideoEncoderSettings::isNull() const /*! Returns the video encoding mode. - \sa QtMultimedia::EncodingMode + \sa QMultimedia::EncodingMode */ -QtMultimedia::EncodingMode QVideoEncoderSettings::encodingMode() const +QMultimedia::EncodingMode QVideoEncoderSettings::encodingMode() const { return d->encodingMode; } @@ -518,15 +518,15 @@ QtMultimedia::EncodingMode QVideoEncoderSettings::encodingMode() const /*! 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, otherwise the bitrate is used. 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->encodingMode = mode; @@ -629,7 +629,7 @@ void QVideoEncoderSettings::setResolution(int width, int height) Returns the video encoding quality. */ -QtMultimedia::EncodingQuality QVideoEncoderSettings::quality() const +QMultimedia::EncodingQuality QVideoEncoderSettings::quality() const { return d->quality; } @@ -641,13 +641,13 @@ QtMultimedia::EncodingQuality QVideoEncoderSettings::quality() const set of encoding parameters to achieve the desired quality level. 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 - {QtMultimedia::ConstantQualityEncoding}{constant quality} + {QMultimedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}. */ -void QVideoEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality) +void QVideoEncoderSettings::setQuality(QMultimedia::EncodingQuality quality) { d->isNull = false; d->quality = quality; @@ -710,7 +710,7 @@ class QImageEncoderSettingsPrivate : public QSharedData public: QImageEncoderSettingsPrivate() : isNull(true), - quality(QtMultimedia::NormalQuality) + quality(QMultimedia::NormalQuality) { } @@ -727,7 +727,7 @@ public: bool isNull; QString codec; QSize resolution; - QtMultimedia::EncodingQuality quality; + QMultimedia::EncodingQuality quality; QVariantMap encodingOptions; private: @@ -887,7 +887,7 @@ void QImageEncoderSettings::setResolution(int width, int height) Returns the image encoding quality. */ -QtMultimedia::EncodingQuality QImageEncoderSettings::quality() const +QMultimedia::EncodingQuality QImageEncoderSettings::quality() const { return d->quality; } @@ -896,7 +896,7 @@ QtMultimedia::EncodingQuality QImageEncoderSettings::quality() const Sets the image encoding \a quality. */ -void QImageEncoderSettings::setQuality(QtMultimedia::EncodingQuality quality) +void QImageEncoderSettings::setQuality(QMultimedia::EncodingQuality quality) { d->isNull = false; d->quality = quality; diff --git a/src/multimedia/recording/qmediaencodersettings.h b/src/multimedia/recording/qmediaencodersettings.h index c5cbf5aae..3f9bae3a5 100644 --- a/src/multimedia/recording/qmediaencodersettings.h +++ b/src/multimedia/recording/qmediaencodersettings.h @@ -70,8 +70,8 @@ public: bool isNull() const; - QtMultimedia::EncodingMode encodingMode() const; - void setEncodingMode(QtMultimedia::EncodingMode); + QMultimedia::EncodingMode encodingMode() const; + void setEncodingMode(QMultimedia::EncodingMode); QString codec() const; void setCodec(const QString& codec); @@ -85,8 +85,8 @@ public: int sampleRate() const; void setSampleRate(int rate); - QtMultimedia::EncodingQuality quality() const; - void setQuality(QtMultimedia::EncodingQuality quality); + QMultimedia::EncodingQuality quality() const; + void setQuality(QMultimedia::EncodingQuality quality); QVariant encodingOption(const QString &option) const; QVariantMap encodingOptions() const; @@ -112,8 +112,8 @@ public: bool isNull() const; - QtMultimedia::EncodingMode encodingMode() const; - void setEncodingMode(QtMultimedia::EncodingMode); + QMultimedia::EncodingMode encodingMode() const; + void setEncodingMode(QMultimedia::EncodingMode); QString codec() const; void setCodec(const QString &); @@ -128,8 +128,8 @@ public: int bitRate() const; void setBitRate(int bitrate); - QtMultimedia::EncodingQuality quality() const; - void setQuality(QtMultimedia::EncodingQuality quality); + QMultimedia::EncodingQuality quality() const; + void setQuality(QMultimedia::EncodingQuality quality); QVariant encodingOption(const QString &option) const; QVariantMap encodingOptions() const; @@ -162,8 +162,8 @@ public: void setResolution(const QSize &); void setResolution(int width, int height); - QtMultimedia::EncodingQuality quality() const; - void setQuality(QtMultimedia::EncodingQuality quality); + QMultimedia::EncodingQuality quality() const; + void setQuality(QMultimedia::EncodingQuality quality); QVariant encodingOption(const QString &option) const; QVariantMap encodingOptions() const; diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index e6bbcdd7e..dd303a12b 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -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_UNUSED(error) @@ -327,8 +327,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) service->releaseControl(d->metaDataControl); } if (d->availabilityControl) { - disconnect(d->availabilityControl, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), - this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); + disconnect(d->availabilityControl, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)), + this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus))); service->releaseControl(d->availabilityControl); } } @@ -379,8 +379,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) d->availabilityControl = service->requestControl<QMediaAvailabilityControl*>(); if (d->availabilityControl) { - connect(d->availabilityControl, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), - this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); + connect(d->availabilityControl, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)), + this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus))); } connect(d->control, SIGNAL(stateChanged(QMediaRecorder::State)), @@ -449,7 +449,7 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) */ bool QMediaRecorder::isAvailable() const { - return availability() == QtMultimedia::Available; + return availability() == QMultimedia::Available; } /*! @@ -457,15 +457,15 @@ bool QMediaRecorder::isAvailable() const \sa availabilityChanged() */ -QtMultimedia::AvailabilityStatus QMediaRecorder::availability() const +QMultimedia::AvailabilityStatus QMediaRecorder::availability() const { if (d_func()->control == NULL) - return QtMultimedia::ServiceMissing; + return QMultimedia::ServiceMissing; if (d_func()->availabilityControl) return d_func()->availabilityControl->availability(); - return QtMultimedia::Available; + return QMultimedia::Available; } 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. */ diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index 39352ee34..56ef888ed 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -116,7 +116,7 @@ public: QMediaObject *mediaObject() const; bool isAvailable() const; - QtMultimedia::AvailabilityStatus availability() const; + QMultimedia::AvailabilityStatus availability() const; QUrl outputLocation() const; bool setOutputLocation(const QUrl &location); @@ -194,7 +194,7 @@ Q_SIGNALS: void metaDataChanged(const QString &key, const QVariant &value); void availabilityChanged(bool available); - void availabilityChanged(QtMultimedia::AvailabilityStatus availability); + void availabilityChanged(QMultimedia::AvailabilityStatus availability); protected: 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_updateNotifyInterval(int)) 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 diff --git a/src/multimedia/recording/qmediarecorder_p.h b/src/multimedia/recording/qmediarecorder_p.h index 06180082d..f4c98c939 100644 --- a/src/multimedia/recording/qmediarecorder_p.h +++ b/src/multimedia/recording/qmediarecorder_p.h @@ -92,7 +92,7 @@ public: void _q_notify(); void _q_updateNotifyInterval(int ms); void _q_applySettings(); - void _q_availabilityChanged(QtMultimedia::AvailabilityStatus availability); + void _q_availabilityChanged(QMultimedia::AvailabilityStatus availability); QMediaRecorder *q_ptr; }; |