diff options
Diffstat (limited to 'src/multimedia/controls')
15 files changed, 35 insertions, 38 deletions
diff --git a/src/multimedia/controls/qaudiodecodercontrol.cpp b/src/multimedia/controls/qaudiodecodercontrol.cpp index b224ae683..09448ca41 100644 --- a/src/multimedia/controls/qaudiodecodercontrol.cpp +++ b/src/multimedia/controls/qaudiodecodercontrol.cpp @@ -96,9 +96,9 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent): */ /*! - \fn QAudioDecoderControl::stateChanged(QAudioDecoder::State state) + \fn QAudioDecoderControl::stateChanged(QAudioDecoder::State newState) - Signals that the \a state of a player control has changed. + Signals that the state of a player control has changed to \a newState. \sa state() */ diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.cpp b/src/multimedia/controls/qaudioencodersettingscontrol.cpp index 60ba633b6..ad0437c6e 100644 --- a/src/multimedia/controls/qaudioencodersettingscontrol.cpp +++ b/src/multimedia/controls/qaudioencodersettingscontrol.cpp @@ -98,9 +98,9 @@ QAudioEncoderSettingsControl::~QAudioEncoderSettingsControl() */ /*! - \fn QAudioEncoderSettingsControl::codecDescription(const QString &codec) const + \fn QAudioEncoderSettingsControl::codecDescription(const QString &codecName) const - Returns description of audio \a codec. + Returns the description of audio codec \a codecName. */ /*! diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.h b/src/multimedia/controls/qaudioencodersettingscontrol.h index 1f973f0ea..ebfa8ad8e 100644 --- a/src/multimedia/controls/qaudioencodersettingscontrol.h +++ b/src/multimedia/controls/qaudioencodersettingscontrol.h @@ -70,7 +70,7 @@ public: bool *continuous = nullptr) const = 0; virtual QAudioEncoderSettings audioSettings() const = 0; - virtual void setAudioSettings(const QAudioEncoderSettings&) = 0; + virtual void setAudioSettings(const QAudioEncoderSettings &settings) = 0; protected: explicit QAudioEncoderSettingsControl(QObject *parent = nullptr); diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.h b/src/multimedia/controls/qcameracapturebufferformatcontrol.h index c659384b6..1c8f44243 100644 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.h +++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.h @@ -59,7 +59,7 @@ public: virtual void setBufferFormat(QVideoFrame::PixelFormat format) = 0; Q_SIGNALS: - void bufferFormatChanged(QVideoFrame::PixelFormat); + void bufferFormatChanged(QVideoFrame::PixelFormat format); protected: explicit QCameraCaptureBufferFormatControl(QObject *parent = nullptr); diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.h b/src/multimedia/controls/qcameracapturedestinationcontrol.h index 30d69d47a..395f8c511 100644 --- a/src/multimedia/controls/qcameracapturedestinationcontrol.h +++ b/src/multimedia/controls/qcameracapturedestinationcontrol.h @@ -59,7 +59,7 @@ public: virtual void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) = 0; Q_SIGNALS: - void captureDestinationChanged(QCameraImageCapture::CaptureDestinations); + void captureDestinationChanged(QCameraImageCapture::CaptureDestinations destination); protected: explicit QCameraCaptureDestinationControl(QObject *parent = nullptr); diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h index f7a1b4288..6c5163118 100644 --- a/src/multimedia/controls/qcameracontrol.h +++ b/src/multimedia/controls/qcameracontrol.h @@ -80,7 +80,7 @@ Q_SIGNALS: void stateChanged(QCamera::State); void statusChanged(QCamera::Status); void error(int error, const QString &errorString); - void captureModeChanged(QCamera::CaptureModes); + void captureModeChanged(QCamera::CaptureModes mode); protected: explicit QCameraControl(QObject *parent = nullptr); diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h index e6700fce5..72b0abda3 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.h +++ b/src/multimedia/controls/qcameraimagecapturecontrol.h @@ -69,13 +69,13 @@ public: virtual void cancelCapture() = 0; Q_SIGNALS: - void readyForCaptureChanged(bool); + void readyForCaptureChanged(bool ready); - void imageExposed(int id); - void imageCaptured(int id, const QImage &preview); + void imageExposed(int requestId); + void imageCaptured(int requestId, const QImage &preview); void imageMetadataAvailable(int id, const QString &key, const QVariant &value); - void imageAvailable(int id, const QVideoFrame &buffer); - void imageSaved(int id, const QString &fileName); + void imageAvailable(int requestId, const QVideoFrame &buffer); + void imageSaved(int requestId, const QString &fileName); void error(int id, int error, const QString &errorString); diff --git a/src/multimedia/controls/qcameralockscontrol.cpp b/src/multimedia/controls/qcameralockscontrol.cpp index d188576ff..d8d6e61cd 100644 --- a/src/multimedia/controls/qcameralockscontrol.cpp +++ b/src/multimedia/controls/qcameralockscontrol.cpp @@ -119,7 +119,7 @@ QCameraLocksControl::~QCameraLocksControl() /*! \fn QCameraLocksControl::lockStatusChanged(QCamera::LockType lock, QCamera::LockStatus status, QCamera::LockChangeReason reason) - Signals the \a lock \a status was changed with a specified \a reason. + Signals the lock \a type \a status was changed with the specified \a reason. */ diff --git a/src/multimedia/controls/qimageencodercontrol.h b/src/multimedia/controls/qimageencodercontrol.h index 9c2164413..0cb4b4333 100644 --- a/src/multimedia/controls/qimageencodercontrol.h +++ b/src/multimedia/controls/qimageencodercontrol.h @@ -54,9 +54,6 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE -// Required for QDoc workaround -class QString; - class Q_MULTIMEDIA_EXPORT QImageEncoderControl : public QMediaControl { Q_OBJECT @@ -65,7 +62,7 @@ public: virtual ~QImageEncoderControl(); virtual QStringList supportedImageCodecs() const = 0; - virtual QString imageCodecDescription(const QString &codecName) const = 0; + virtual QString imageCodecDescription(const QString &codec) const = 0; virtual QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, bool *continuous = nullptr) const = 0; diff --git a/src/multimedia/controls/qmediacontainercontrol.cpp b/src/multimedia/controls/qmediacontainercontrol.cpp index 34b759a6a..1b6c4bf03 100644 --- a/src/multimedia/controls/qmediacontainercontrol.cpp +++ b/src/multimedia/controls/qmediacontainercontrol.cpp @@ -111,9 +111,9 @@ QMediaContainerControl::~QMediaContainerControl() */ /*! - \fn QMediaContainerControl::containerDescription(const QString &format) const + \fn QMediaContainerControl::containerDescription(const QString &formatMimeType) const - Returns a description of the container \a format. + Returns a description of the container \a formatMimeType. */ #include "moc_qmediacontainercontrol.cpp" diff --git a/src/multimedia/controls/qmediaplayercontrol.cpp b/src/multimedia/controls/qmediaplayercontrol.cpp index 07b277ffb..23c02d57f 100644 --- a/src/multimedia/controls/qmediaplayercontrol.cpp +++ b/src/multimedia/controls/qmediaplayercontrol.cpp @@ -104,9 +104,9 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): */ /*! - \fn QMediaPlayerControl::stateChanged(QMediaPlayer::State state) + \fn QMediaPlayerControl::stateChanged(QMediaPlayer::State newState) - Signals that the \a state of a player control has changed. + Signals that the state of a player control has changed to \a newState. \sa state() */ @@ -231,9 +231,9 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): */ /*! - \fn QMediaPlayerControl::audioAvailableChanged(bool audio) + \fn QMediaPlayerControl::audioAvailableChanged(bool audioAvailable) - Signals that there has been a change in the availability of \a audio output. + Signals that there has been a change in the availability of audio output \a audioAvailable. \sa isAudioAvailable() */ diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h index d231097f4..8b5072572 100644 --- a/src/multimedia/controls/qmediaplayercontrol.h +++ b/src/multimedia/controls/qmediaplayercontrol.h @@ -71,7 +71,7 @@ public: virtual void setVolume(int volume) = 0; virtual bool isMuted() const = 0; - virtual void setMuted(bool muted) = 0; + virtual void setMuted(bool mute) = 0; virtual int bufferStatus() const = 0; @@ -100,12 +100,12 @@ Q_SIGNALS: void stateChanged(QMediaPlayer::State newState); void mediaStatusChanged(QMediaPlayer::MediaStatus status); void volumeChanged(int volume); - void mutedChanged(bool muted); + void mutedChanged(bool mute); void audioAvailableChanged(bool audioAvailable); void videoAvailableChanged(bool videoAvailable); void bufferStatusChanged(int percentFilled); - void seekableChanged(bool); - void availablePlaybackRangesChanged(const QMediaTimeRange&); + void seekableChanged(bool seekable); + void availablePlaybackRangesChanged(const QMediaTimeRange &ranges); void playbackRateChanged(qreal rate); void error(int error, const QString &errorString); diff --git a/src/multimedia/controls/qmediastreamscontrol.cpp b/src/multimedia/controls/qmediastreamscontrol.cpp index ad1c62f15..2daf50de8 100644 --- a/src/multimedia/controls/qmediastreamscontrol.cpp +++ b/src/multimedia/controls/qmediastreamscontrol.cpp @@ -113,30 +113,30 @@ QMediaStreamsControl::~QMediaStreamsControl() */ /*! - \fn QMediaStreamsControl::streamType(int stream) + \fn QMediaStreamsControl::streamType(int streamNumber) - Return the type of a media \a stream. + Return the type of media stream \a streamNumber. */ /*! - \fn QMediaStreamsControl::metaData(int stream, const QString &key) + \fn QMediaStreamsControl::metaData(int streamNumber, const QString &key) - Returns the meta-data value of \a key for a given \a stream. + Returns the meta-data value of \a key for the given \a streamNumber. Useful metadata keys are QMediaMetaData::Title, QMediaMetaData::Description and QMediaMetaData::Language. */ /*! - \fn QMediaStreamsControl::isActive(int stream) + \fn QMediaStreamsControl::isActive(int streamNumber) - Returns true if the media \a stream is active. + Returns true if the media stream \a streamNumber is active. */ /*! - \fn QMediaStreamsControl::setActive(int stream, bool state) + \fn QMediaStreamsControl::setActive(int streamNumber, bool state) - Sets the active \a state of a media \a stream. + Sets the active \a state of media stream \a streamNumber. Setting the active state of a media stream to true will activate it. If any other stream of the same type was previously active it will be deactivated. Setting the active state fo a diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.h b/src/multimedia/controls/qvideodeviceselectorcontrol.h index 2d55c0d70..4697196ce 100644 --- a/src/multimedia/controls/qvideodeviceselectorcontrol.h +++ b/src/multimedia/controls/qvideodeviceselectorcontrol.h @@ -67,7 +67,7 @@ public Q_SLOTS: Q_SIGNALS: void selectedDeviceChanged(int index); - void selectedDeviceChanged(const QString &deviceName); + void selectedDeviceChanged(const QString &name); void devicesChanged(); protected: diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.h b/src/multimedia/controls/qvideoencodersettingscontrol.h index 366d585ee..8c8213cf5 100644 --- a/src/multimedia/controls/qvideoencodersettingscontrol.h +++ b/src/multimedia/controls/qvideoencodersettingscontrol.h @@ -71,7 +71,7 @@ public: bool *continuous = nullptr) const = 0; virtual QStringList supportedVideoCodecs() const = 0; - virtual QString videoCodecDescription(const QString &codecName) const = 0; + virtual QString videoCodecDescription(const QString &codec) const = 0; virtual QVideoEncoderSettings videoSettings() const = 0; virtual void setVideoSettings(const QVideoEncoderSettings &settings) = 0; |