diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-06-11 11:06:25 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-06-16 08:56:48 +0200 |
| commit | 994bcb23af8399485ddfdd16d2ba34c20326b432 (patch) | |
| tree | 6eab8c28f89c82382321becde133f8dba885bd81 /examples/multimediawidgets/camera/camera.cpp | |
| parent | 52c8d7efdd4f783097dcec6e66f3e076cdbc88ca (diff) | |
Kill QMediaEncoderBase
The class was only needed because of QMediaRecorder. Now
that that class is gone, we can move the enums into QMediaEncoder.
Also rename the State enum to RecorderState as per API review.
Change-Id: I2e0811e2c29f922265ac5a719226b647236e52b9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'examples/multimediawidgets/camera/camera.cpp')
| -rw-r--r-- | examples/multimediawidgets/camera/camera.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp index ef33c98e7..796f37f42 100644 --- a/examples/multimediawidgets/camera/camera.cpp +++ b/examples/multimediawidgets/camera/camera.cpp @@ -103,7 +103,7 @@ void Camera::setCamera(const QCameraDevice &cameraInfo) m_mediaEncoder.reset(new QMediaEncoder); m_captureSession.setEncoder(m_mediaEncoder.data()); - connect(m_mediaEncoder.data(), &QMediaEncoder::stateChanged, this, &Camera::updateRecorderState); + connect(m_mediaEncoder.data(), &QMediaEncoder::recorderStateChanged, this, &Camera::updateRecorderState); m_imageCapture = new QCameraImageCapture; m_captureSession.setImageCapture(m_imageCapture); @@ -116,7 +116,7 @@ void Camera::setCamera(const QCameraDevice &cameraInfo) m_captureSession.setVideoOutput(ui->viewfinder); updateCameraActive(m_camera->isActive()); - updateRecorderState(m_mediaEncoder->state()); + updateRecorderState(m_mediaEncoder->recorderState()); connect(m_imageCapture, &QCameraImageCapture::readyForCaptureChanged, this, &Camera::readyForCapture); connect(m_imageCapture, &QCameraImageCapture::imageCaptured, this, &Camera::processCapturedImage); @@ -142,7 +142,7 @@ void Camera::keyPressEvent(QKeyEvent * event) if (m_doImageCapture) { takeImage(); } else { - if (m_mediaEncoder->state() == QMediaEncoder::RecordingState) + if (m_mediaEncoder->recorderState() == QMediaEncoder::RecordingState) stop(); else record(); @@ -277,7 +277,7 @@ void Camera::updateCameraActive(bool active) } } -void Camera::updateRecorderState(QMediaEncoder::State state) +void Camera::updateRecorderState(QMediaEncoder::RecorderState state) { switch (state) { case QMediaEncoder::StoppedState: |