diff options
Diffstat (limited to 'src/multimedia/platform/qnx')
4 files changed, 12 insertions, 12 deletions
diff --git a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp index c5df78ece..11c486953 100644 --- a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp +++ b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp @@ -65,7 +65,7 @@ BbCameraMediaRecorderControl::BbCameraMediaRecorderControl(BbCameraSession *sess : QPlatformMediaEncoder(parent) , m_session(session) { - connect(m_session, SIGNAL(videoStateChanged(QMediaEncoder::State)), this, SIGNAL(stateChanged(QMediaEncoder::State))); + connect(m_session, SIGNAL(videoStateChanged(QMediaEncoder::RecorderState)), this, SIGNAL(stateChanged(QMediaEncoder::RecorderState))); connect(m_session, SIGNAL(videoStatusChanged(QMediaEncoder::Status)), this, SIGNAL(statusChanged(QMediaEncoder::Status))); connect(m_session, SIGNAL(durationChanged(qint64)), this, SIGNAL(durationChanged(qint64))); connect(m_session, SIGNAL(actualLocationChanged(QUrl)), this, SIGNAL(actualLocationChanged(QUrl))); @@ -82,7 +82,7 @@ bool BbCameraMediaRecorderControl::setOutputLocation(const QUrl &location) return m_session->setOutputLocation(location); } -QMediaEncoder::State BbCameraMediaRecorderControl::state() const +QMediaEncoder::RecorderState BbCameraMediaRecorderControl::state() const { return m_session->videoState(); } @@ -128,7 +128,7 @@ void BbCameraMediaRecorderControl::applySettings() m_session->applyVideoSettings(); } -void BbCameraMediaRecorderControl::setState(QMediaEncoder::State state) +void BbCameraMediaRecorderControl::setState(QMediaEncoder::RecorderState state) { m_session->setVideoState(state); } diff --git a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h index e8d550c81..c485988ca 100644 --- a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h +++ b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h @@ -64,7 +64,7 @@ public: QUrl outputLocation() const override; bool setOutputLocation(const QUrl &location) override; - QMediaEncoder::State state() const override; + QMediaEncoder::RecorderState state() const override; QMediaEncoder::Status status() const override; qint64 duration() const override; bool isMuted() const override; @@ -72,7 +72,7 @@ public: void applySettings() override; public Q_SLOTS: - void setState(QMediaEncoder::State state) override; + void setState(QMediaEncoder::RecorderState state) override; void setMuted(bool muted) override; void setVolume(qreal volume) override; diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp index ad6e43a49..5f0e5d843 100644 --- a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp +++ b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp @@ -418,17 +418,17 @@ bool BbCameraSession::setOutputLocation(const QUrl &location) return true; } -QMediaEncoder::State BbCameraSession::videoState() const +QMediaEncoder::RecorderState BbCameraSession::videoState() const { return m_videoState; } -void BbCameraSession::setVideoState(QMediaEncoder::State state) +void BbCameraSession::setVideoState(QMediaEncoder::RecorderState state) { if (m_videoState == state) return; - const QMediaEncoder::State previousState = m_videoState; + const QMediaEncoder::RecorderState previousState = m_videoState; if (previousState == QMediaEncoder::StoppedState) { if (state == QMediaEncoder::RecordingState) { diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession_p.h b/src/multimedia/platform/qnx/camera/bbcamerasession_p.h index 1b5b09c91..67a2f1685 100644 --- a/src/multimedia/platform/qnx/camera/bbcamerasession_p.h +++ b/src/multimedia/platform/qnx/camera/bbcamerasession_p.h @@ -109,8 +109,8 @@ public: // media recorder control QUrl outputLocation() const; bool setOutputLocation(const QUrl &location); - QMediaEncoder::State videoState() const; - void setVideoState(QMediaEncoder::State state); + QMediaEncoder::RecorderState videoState() const; + void setVideoState(QMediaEncoder::RecorderState state); QMediaEncoder::Status videoStatus() const; qint64 duration() const; void applyVideoSettings(); @@ -142,7 +142,7 @@ Q_SIGNALS: void imageCaptureError(int id, int error, const QString &errorString); // media recorder control - void videoStateChanged(QMediaEncoder::State state); + void videoStateChanged(QMediaEncoder::RecorderState state); void videoStatusChanged(QMediaEncoder::Status status); void durationChanged(qint64 duration); void actualLocationChanged(const QUrl &location); @@ -192,7 +192,7 @@ private: QImageEncoderSettings m_imageEncoderSettings; QString m_videoOutputLocation; - QMediaEncoder::State m_videoState; + QMediaEncoder::RecorderState m_videoState; QMediaEncoder::Status m_videoStatus; QElapsedTimer m_videoRecordingDuration; |