diff options
Diffstat (limited to 'examples/multimediawidgets/camera/camera.cpp')
| -rw-r--r-- | examples/multimediawidgets/camera/camera.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
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 <QMediaEncoder> +#include <QMediaRecorder> #include <QVideoWidget> #include <QCameraDevice> #include <QMediaMetaData> @@ -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()); } |