From fde5d6f7cce6118cac4ce7b92cd056225737917f Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 11 Jun 2021 11:55:29 +0200 Subject: Rename QMediaEncoder to QMediaRecorder As per API review, this is the better name. Since we removed the old QMediaRecorder class, the name is free as well. Change-Id: I1ec9af3876af8b6957e20c13f9e225bf1e5032d5 Reviewed-by: Volker Hilsheimer --- examples/multimediawidgets/camera/camera.cpp | 22 +++++++++++----------- examples/multimediawidgets/camera/camera.h | 6 +++--- .../multimediawidgets/camera/doc/src/camera.qdoc | 6 +++--- .../multimediawidgets/camera/videosettings.cpp | 4 ++-- examples/multimediawidgets/camera/videosettings.h | 6 +++--- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'examples/multimediawidgets') diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp index 796f37f42..f45971e9f 100644 --- a/examples/multimediawidgets/camera/camera.cpp +++ b/examples/multimediawidgets/camera/camera.cpp @@ -54,7 +54,7 @@ #include "imagesettings.h" #include "metadatadialog.h" -#include +#include #include #include #include @@ -101,15 +101,15 @@ void Camera::setCamera(const QCameraDevice &cameraInfo) connect(m_camera.data(), &QCamera::activeChanged, this, &Camera::updateCameraActive); connect(m_camera.data(), &QCamera::errorOccurred, this, &Camera::displayCameraError); - m_mediaEncoder.reset(new QMediaEncoder); + m_mediaEncoder.reset(new QMediaRecorder); m_captureSession.setEncoder(m_mediaEncoder.data()); - connect(m_mediaEncoder.data(), &QMediaEncoder::recorderStateChanged, this, &Camera::updateRecorderState); + connect(m_mediaEncoder.data(), &QMediaRecorder::recorderStateChanged, this, &Camera::updateRecorderState); m_imageCapture = new QCameraImageCapture; m_captureSession.setImageCapture(m_imageCapture); - connect(m_mediaEncoder.data(), &QMediaEncoder::durationChanged, this, &Camera::updateRecordTime); - connect(m_mediaEncoder.data(), &QMediaEncoder::errorChanged, this, &Camera::displayRecorderError); + connect(m_mediaEncoder.data(), &QMediaRecorder::durationChanged, this, &Camera::updateRecordTime); + connect(m_mediaEncoder.data(), &QMediaRecorder::errorChanged, this, &Camera::displayRecorderError); connect(ui->exposureCompensation, &QAbstractSlider::valueChanged, this, &Camera::setExposureCompensation); @@ -142,7 +142,7 @@ void Camera::keyPressEvent(QKeyEvent * event) if (m_doImageCapture) { takeImage(); } else { - if (m_mediaEncoder->recorderState() == QMediaEncoder::RecordingState) + if (m_mediaEncoder->recorderState() == QMediaRecorder::RecordingState) stop(); else record(); @@ -277,22 +277,22 @@ void Camera::updateCameraActive(bool active) } } -void Camera::updateRecorderState(QMediaEncoder::RecorderState state) +void Camera::updateRecorderState(QMediaRecorder::RecorderState state) { switch (state) { - case QMediaEncoder::StoppedState: + case QMediaRecorder::StoppedState: ui->recordButton->setEnabled(true); ui->pauseButton->setEnabled(true); ui->stopButton->setEnabled(false); ui->metaDataButton->setEnabled(true); break; - case QMediaEncoder::PausedState: + case QMediaRecorder::PausedState: ui->recordButton->setEnabled(true); ui->pauseButton->setEnabled(false); ui->stopButton->setEnabled(true); ui->metaDataButton->setEnabled(false); break; - case QMediaEncoder::RecordingState: + case QMediaRecorder::RecordingState: ui->recordButton->setEnabled(false); ui->pauseButton->setEnabled(true); ui->stopButton->setEnabled(true); @@ -308,7 +308,7 @@ void Camera::setExposureCompensation(int index) void Camera::displayRecorderError() { - if (m_mediaEncoder->error() != QMediaEncoder::NoError) + if (m_mediaEncoder->error() != QMediaRecorder::NoError) QMessageBox::warning(this, tr("Capture Error"), m_mediaEncoder->errorString()); } diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h index 48ea876d9..6a55f42b3 100644 --- a/examples/multimediawidgets/camera/camera.h +++ b/examples/multimediawidgets/camera/camera.h @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include #include @@ -104,7 +104,7 @@ private slots: void updateCameraActive(bool active); void updateCaptureMode(); - void updateRecorderState(QMediaEncoder::RecorderState state); + void updateRecorderState(QMediaRecorder::RecorderState state); void setExposureCompensation(int index); void updateRecordTime(); @@ -136,7 +136,7 @@ private: QScopedPointer m_camera; QScopedPointer m_audioInput; QCameraImageCapture *m_imageCapture; - QScopedPointer m_mediaEncoder; + QScopedPointer m_mediaEncoder; QMediaEncoderSettings m_encoderSettings; bool m_isCapturingImage = false; diff --git a/examples/multimediawidgets/camera/doc/src/camera.qdoc b/examples/multimediawidgets/camera/doc/src/camera.qdoc index 8792674b8..68e19aac3 100644 --- a/examples/multimediawidgets/camera/doc/src/camera.qdoc +++ b/examples/multimediawidgets/camera/doc/src/camera.qdoc @@ -49,7 +49,7 @@ settings. The Camera class contains an instance of \l {QCamera}, the API class interface to the hardware. It also has an instance of \l {QCameraImageCapture} to take still images -and an instance of \l {QMediaEncoder} to record video. It also contains the user +and an instance of \l {QMediaRecorder} to record video. It also contains the user interface object. The Camera constructor does some basic initialization. The camera object is @@ -59,7 +59,7 @@ the \e{setCamera()} function is called, passing in a \l {QByteArray}. \e{setCamera()} sets up various connections between the user interface and the functionality of the Camera class using signals and slots. It also instantiates and initializes the \l {QCamera}, -\l {QCameraImageCapture} and \l {QMediaEncoder} objects mentioned above. The still +\l {QCameraImageCapture} and \l {QMediaRecorder} objects mentioned above. The still and video recording visual tabs are enabled and finally the \l {QCamera::start()}{start()} function of the \l{QCamera} object is called. @@ -72,7 +72,7 @@ is QCamera::CaptureStillImage, or if the capture mode is for video then one of two actions will occur. If the recording state shows that we are currently recording then the \e{stop()} function is called resulting in a call to \l {QCamera::stop()}, whereas if we are not recording then a video recording -is started with a call to \l {QMediaEncoder::record()}. +is started with a call to \l {QMediaRecorder::record()}. \image camera-example.png diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp index cb17fda57..9bc0d0ea0 100644 --- a/examples/multimediawidgets/camera/videosettings.cpp +++ b/examples/multimediawidgets/camera/videosettings.cpp @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include @@ -62,7 +62,7 @@ #include #include -VideoSettings::VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent) +VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) : QDialog(parent), ui(new Ui::VideoSettingsUi), mediaRecorder(mediaRecorder) diff --git a/examples/multimediawidgets/camera/videosettings.h b/examples/multimediawidgets/camera/videosettings.h index 05a21b4e4..2cb690d27 100644 --- a/examples/multimediawidgets/camera/videosettings.h +++ b/examples/multimediawidgets/camera/videosettings.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE class QComboBox; -class QMediaEncoder; +class QMediaRecorder; namespace Ui { class VideoSettingsUi; } QT_END_NAMESPACE @@ -65,7 +65,7 @@ class VideoSettings : public QDialog Q_OBJECT public: - explicit VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent = nullptr); + explicit VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent = nullptr); ~VideoSettings(); QMediaEncoderSettings encoderSettings() const; @@ -79,7 +79,7 @@ private: void selectComboBoxItem(QComboBox *box, const QVariant &value); Ui::VideoSettingsUi *ui; - QMediaEncoder *mediaRecorder; + QMediaRecorder *mediaRecorder; }; #endif // VIDEOSETTINGS_H -- cgit v1.2.3