Rename QMediaCaptureSession::encoder to recorder

As the class is called QMediaRecorder this is required
for API consistency. Also cleaned up the front end code
and examples where they used encoder instead of recorder.

Cleanup of the backend will have to come in a separate change.

Change-Id: I6e63e607473e68f628b1f89ffa3edcbc5bf5c2c8
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Bartlomiej Moskal <bartlomiej.moskal@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

8 files changed, 51 insertions, 51 deletions

diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
index 813ec1212..3be305465 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.cpp
+++ b/examples/multimedia/audiorecorder/audiorecorder.cpp
@@ -72,8 +72,8 @@ AudioRecorder::AudioRecorder()
 {
     ui->setupUi(this);
 
-    m_audioEncoder = new QMediaRecorder(this);
-    m_captureSession.setEncoder(m_audioEncoder);
+    m_audioRecorder = new QMediaRecorder(this);
+    m_captureSession.setRecorder(m_audioRecorder);
     m_captureSession.setAudioInput(new QAudioInput(this));
     // ### replace with a monitoring output once we have it.
 //    m_probe = new QAudioProbe(this);
@@ -124,14 +124,14 @@ AudioRecorder::AudioRecorder()
     ui->bitrateBox->addItem(QStringLiteral("96000"), QVariant(96000));
     ui->bitrateBox->addItem(QStringLiteral("128000"), QVariant(128000));
 
-    connect(m_audioEncoder, &QMediaRecorder::durationChanged, this, &AudioRecorder::updateProgress);
-    connect(m_audioEncoder, &QMediaRecorder::recorderStateChanged, this, &AudioRecorder::onStateChanged);
-    connect(m_audioEncoder, &QMediaRecorder::errorChanged, this, &AudioRecorder::displayErrorMessage);
+    connect(m_audioRecorder, &QMediaRecorder::durationChanged, this, &AudioRecorder::updateProgress);
+    connect(m_audioRecorder, &QMediaRecorder::recorderStateChanged, this, &AudioRecorder::onStateChanged);
+    connect(m_audioRecorder, &QMediaRecorder::errorChanged, this, &AudioRecorder::displayErrorMessage);
 }
 
 void AudioRecorder::updateProgress(qint64 duration)
 {
-    if (m_audioEncoder->error() != QMediaRecorder::NoError || duration < 2000)
+    if (m_audioRecorder->error() != QMediaRecorder::NoError || duration < 2000)
         return;
 
     ui->statusbar->showMessage(tr("Recorded %1 sec").arg(duration / 1000));
@@ -143,7 +143,7 @@ void AudioRecorder::onStateChanged(QMediaRecorder::RecorderState state)
 
     switch (state) {
     case QMediaRecorder::RecordingState:
-        statusMessage = tr("Recording to %1").arg(m_audioEncoder->actualLocation().toString());
+        statusMessage = tr("Recording to %1").arg(m_audioRecorder->actualLocation().toString());
         ui->recordButton->setText(tr("Stop"));
         ui->pauseButton->setText(tr("Pause"));
         break;
@@ -161,8 +161,8 @@ void AudioRecorder::onStateChanged(QMediaRecorder::RecorderState state)
         break;
     }
 
-    ui->pauseButton->setEnabled(m_audioEncoder->recorderState() != QMediaRecorder::StoppedState);
-    if (m_audioEncoder->error() == QMediaRecorder::NoError)
+    ui->pauseButton->setEnabled(m_audioRecorder->recorderState() != QMediaRecorder::StoppedState);
+    if (m_audioRecorder->error() == QMediaRecorder::NoError)
         ui->statusbar->showMessage(statusMessage);
 }
 
@@ -177,34 +177,34 @@ static QVariant boxValue(const QComboBox *box)
 
 void AudioRecorder::toggleRecord()
 {
-    if (m_audioEncoder->recorderState() == QMediaRecorder::StoppedState) {
+    if (m_audioRecorder->recorderState() == QMediaRecorder::StoppedState) {
         m_captureSession.audioInput()->setDevice(boxValue(ui->audioDeviceBox).value<QAudioDevice>());
 
         QMediaFormat format;
         format.setFileFormat(boxValue(ui->containerBox).value<QMediaFormat::FileFormat>());
         format.setAudioCodec(boxValue(ui->audioCodecBox).value<QMediaFormat::AudioCodec>());
-        m_audioEncoder->setMediaFormat(format);
-        m_audioEncoder->setAudioSampleRate(ui->sampleRateBox->value());
-        m_audioEncoder->setAudioBitRate(boxValue(ui->bitrateBox).toInt());
-        m_audioEncoder->setAudioChannelCount(boxValue(ui->channelsBox).toInt());
-        m_audioEncoder->setQuality(QMediaRecorder::Quality(ui->qualitySlider->value()));
-        m_audioEncoder->setEncodingMode(ui->constantQualityRadioButton->isChecked() ?
+        m_audioRecorder->setMediaFormat(format);
+        m_audioRecorder->setAudioSampleRate(ui->sampleRateBox->value());
+        m_audioRecorder->setAudioBitRate(boxValue(ui->bitrateBox).toInt());
+        m_audioRecorder->setAudioChannelCount(boxValue(ui->channelsBox).toInt());
+        m_audioRecorder->setQuality(QMediaRecorder::Quality(ui->qualitySlider->value()));
+        m_audioRecorder->setEncodingMode(ui->constantQualityRadioButton->isChecked() ?
                                  QMediaRecorder::ConstantQualityEncoding :
                                  QMediaRecorder::ConstantBitRateEncoding);
 
-        m_audioEncoder->record();
+        m_audioRecorder->record();
     }
     else {
-        m_audioEncoder->stop();
+        m_audioRecorder->stop();
     }
 }
 
 void AudioRecorder::togglePause()
 {
-    if (m_audioEncoder->recorderState() != QMediaRecorder::PausedState)
-        m_audioEncoder->pause();
+    if (m_audioRecorder->recorderState() != QMediaRecorder::PausedState)
+        m_audioRecorder->pause();
     else
-        m_audioEncoder->record();
+        m_audioRecorder->record();
 }
 
 void AudioRecorder::setOutputLocation()
@@ -220,13 +220,13 @@ void AudioRecorder::setOutputLocation()
 #else
     QString fileName = QFileDialog::getSaveFileName();
 #endif
-    m_audioEncoder->setOutputLocation(QUrl::fromLocalFile(fileName));
+    m_audioRecorder->setOutputLocation(QUrl::fromLocalFile(fileName));
     m_outputLocationSet = true;
 }
 
 void AudioRecorder::displayErrorMessage()
 {
-    ui->statusbar->showMessage(m_audioEncoder->errorString());
+    ui->statusbar->showMessage(m_audioRecorder->errorString());
 }
 
 void AudioRecorder::clearAudioLevels()
diff --git a/examples/multimedia/audiorecorder/audiorecorder.h b/examples/multimedia/audiorecorder/audiorecorder.h
index fae682c6f..97bd49688 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.h
+++ b/examples/multimedia/audiorecorder/audiorecorder.h
@@ -88,7 +88,7 @@ private:
     Ui::AudioRecorder *ui = nullptr;
 
     QMediaCaptureSession m_captureSession;
-    QMediaRecorder *m_audioEncoder = nullptr;
+    QMediaRecorder *m_audioRecorder = nullptr;
     QList<AudioLevel*> m_audioLevels;
     bool m_outputLocationSet = false;
 
diff --git a/examples/multimedia/declarative-camera/VideoCaptureControls.qml b/examples/multimedia/declarative-camera/VideoCaptureControls.qml
index 3fc787d30..fa1819f6e 100644
--- a/examples/multimedia/declarative-camera/VideoCaptureControls.qml
+++ b/examples/multimedia/declarative-camera/VideoCaptureControls.qml
@@ -81,22 +81,22 @@ FocusScope {
 
             CameraButton {
                 text: "Record"
-                visible: captureSession.encoder.status !== MediaEncoder.RecordingStatus
-                onClicked: captureSession.encoder.record()
+                visible: captureSession.recorder.status !== MediaRecorder.RecordingStatus
+                onClicked: captureSession.recorder.record()
             }
 
             CameraButton {
                 id: stopButton
                 text: "Stop"
-                visible: captureSession.encoder.status === MediaEncoder.RecordingStatus
-                onClicked: captureSession.encoder.stop()
+                visible: captureSession.recorder.status === MediaRecorder.RecordingStatus
+                onClicked: captureSession.recorder.stop()
             }
 
             CameraButton {
                 text: "View"
                 onClicked: captureControls.previewSelected()
                 //don't show View button during recording
-                visible: captureSession.encoder.actualLocation && !stopButton.visible
+                visible: captureSession.recorder.actualLocation && !stopButton.visible
             }
         }
 
diff --git a/examples/multimedia/declarative-camera/declarative-camera.qml b/examples/multimedia/declarative-camera/declarative-camera.qml
index 2b4ae20ad..51efb2b5b 100644
--- a/examples/multimedia/declarative-camera/declarative-camera.qml
+++ b/examples/multimedia/declarative-camera/declarative-camera.qml
@@ -99,8 +99,8 @@ Rectangle {
             id: imageCapture
         }
 
-        encoder: MediaEncoder {
-            id: encoder
+        recorder: MediaRecorder {
+            id: recorder
 //             resolution: "640x480"
 //             frameRate: 30
         }
@@ -124,7 +124,7 @@ Rectangle {
         focus: visible
 
         //don't load recorded video if preview is invisible
-        source: visible ? encoder.actualLocation : ""
+        source: visible ? recorder.actualLocation : ""
     }
 
     VideoOutput {
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml
index 3ee257ffa..26ffcc352 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml
@@ -75,8 +75,8 @@ Item {
             id: imageCapture
         }
 
-        encoder: MediaEncoder {
-            id: encoder
+        recorder: MediaRecorder {
+            id: recorder
 //             resolution: "640x480"
 //             frameRate: 30
         }
diff --git a/examples/multimedia/video/recorder/main.qml b/examples/multimedia/video/recorder/main.qml
index c9c58eaa2..13ef0cd84 100644
--- a/examples/multimedia/video/recorder/main.qml
+++ b/examples/multimedia/video/recorder/main.qml
@@ -73,7 +73,7 @@ Window {
 
     CaptureSession {
         id: captureSession
-        encoder: recorder
+        recorder: recorder
         audioInput: controls.audioInput
         camera: controls.camera
         videoOutput: playback.active ? null : videoOutput
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index 89667ab43..a18b77b8a 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -101,22 +101,22 @@ void Camera::setCamera(const QCameraDevice &cameraDevice)
     connect(m_camera.data(), &QCamera::activeChanged, this, &Camera::updateCameraActive);
     connect(m_camera.data(), &QCamera::errorOccurred, this, &Camera::displayCameraError);
 
-    m_mediaEncoder.reset(new QMediaRecorder);
-    m_captureSession.setEncoder(m_mediaEncoder.data());
-    connect(m_mediaEncoder.data(), &QMediaRecorder::recorderStateChanged, this, &Camera::updateRecorderState);
+    m_mediaRecorder.reset(new QMediaRecorder);
+    m_captureSession.setRecorder(m_mediaRecorder.data());
+    connect(m_mediaRecorder.data(), &QMediaRecorder::recorderStateChanged, this, &Camera::updateRecorderState);
 
     m_imageCapture = new QImageCapture;
     m_captureSession.setImageCapture(m_imageCapture);
 
-    connect(m_mediaEncoder.data(), &QMediaRecorder::durationChanged, this, &Camera::updateRecordTime);
-    connect(m_mediaEncoder.data(), &QMediaRecorder::errorChanged, this, &Camera::displayRecorderError);
+    connect(m_mediaRecorder.data(), &QMediaRecorder::durationChanged, this, &Camera::updateRecordTime);
+    connect(m_mediaRecorder.data(), &QMediaRecorder::errorChanged, this, &Camera::displayRecorderError);
 
     connect(ui->exposureCompensation, &QAbstractSlider::valueChanged, this, &Camera::setExposureCompensation);
 
     m_captureSession.setVideoOutput(ui->viewfinder);
 
     updateCameraActive(m_camera->isActive());
-    updateRecorderState(m_mediaEncoder->recorderState());
+    updateRecorderState(m_mediaRecorder->recorderState());
 
     connect(m_imageCapture, &QImageCapture::readyForCaptureChanged, this, &Camera::readyForCapture);
     connect(m_imageCapture, &QImageCapture::imageCaptured, this, &Camera::processCapturedImage);
@@ -142,7 +142,7 @@ void Camera::keyPressEvent(QKeyEvent * event)
         if (m_doImageCapture) {
             takeImage();
         } else {
-            if (m_mediaEncoder->recorderState() == QMediaRecorder::RecordingState)
+            if (m_mediaRecorder->recorderState() == QMediaRecorder::RecordingState)
                 stop();
             else
                 record();
@@ -161,7 +161,7 @@ void Camera::keyReleaseEvent(QKeyEvent *event)
 
 void Camera::updateRecordTime()
 {
-    QString str = QString("Recorded %1 sec").arg(m_mediaEncoder->duration()/1000);
+    QString str = QString("Recorded %1 sec").arg(m_mediaRecorder->duration()/1000);
     ui->statusbar->showMessage(str);
 }
 
@@ -189,7 +189,7 @@ void Camera::configureCaptureSettings()
 
 void Camera::configureVideoSettings()
 {
-    VideoSettings settingsDialog(m_mediaEncoder.data());
+    VideoSettings settingsDialog(m_mediaRecorder.data());
     settingsDialog.setWindowFlags(settingsDialog.windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
     if (settingsDialog.exec())
@@ -208,18 +208,18 @@ void Camera::configureImageSettings()
 
 void Camera::record()
 {
-    m_mediaEncoder->record();
+    m_mediaRecorder->record();
     updateRecordTime();
 }
 
 void Camera::pause()
 {
-    m_mediaEncoder->pause();
+    m_mediaRecorder->pause();
 }
 
 void Camera::stop()
 {
-    m_mediaEncoder->stop();
+    m_mediaRecorder->stop();
 }
 
 void Camera::setMuted(bool muted)
@@ -303,8 +303,8 @@ void Camera::setExposureCompensation(int index)
 
 void Camera::displayRecorderError()
 {
-    if (m_mediaEncoder->error() != QMediaRecorder::NoError)
-        QMessageBox::warning(this, tr("Capture Error"), m_mediaEncoder->errorString());
+    if (m_mediaRecorder->error() != QMediaRecorder::NoError)
+        QMessageBox::warning(this, tr("Capture Error"), m_mediaRecorder->errorString());
 }
 
 void Camera::displayCameraError()
@@ -402,6 +402,6 @@ void Camera::saveMetaData()
             }
         }
     }
-    m_mediaEncoder->setMetaData(data);
+    m_mediaRecorder->setMetaData(data);
 }
 
diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index d5920a0f3..786a6f722 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -136,7 +136,7 @@ private:
     QScopedPointer<QCamera> m_camera;
     QScopedPointer<QAudioInput> m_audioInput;
     QImageCapture *m_imageCapture;
-    QScopedPointer<QMediaRecorder> m_mediaEncoder;
+    QScopedPointer<QMediaRecorder> m_mediaRecorder;
 
     bool m_isCapturingImage = false;
     bool m_applicationExiting = false;