diff options
Diffstat (limited to 'src/multimedia/platform/android/mediacapture')
4 files changed, 10 insertions, 10 deletions
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp index f8861982e..287ec17bc 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp @@ -159,12 +159,12 @@ bool QAndroidCaptureSession::setOutputLocation(const QUrl &location) return false; } -QMediaEncoder::State QAndroidCaptureSession::state() const +QMediaEncoder::RecorderState QAndroidCaptureSession::state() const { return m_state; } -void QAndroidCaptureSession::setState(QMediaEncoder::State state) +void QAndroidCaptureSession::setState(QMediaEncoder::RecorderState state) { if (m_state == state) return; diff --git a/src/multimedia/platform/android/mediacapture/qandroidcapturesession_p.h b/src/multimedia/platform/android/mediacapture/qandroidcapturesession_p.h index 772c08738..995e70abf 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcapturesession_p.h +++ b/src/multimedia/platform/android/mediacapture/qandroidcapturesession_p.h @@ -80,8 +80,8 @@ public: QUrl outputLocation() const; bool setOutputLocation(const QUrl &location); - QMediaEncoder::State state() const; - void setState(QMediaEncoder::State state); + QMediaEncoder::RecorderState state() const; + void setState(QMediaEncoder::RecorderState state); QMediaEncoder::Status status() const; @@ -94,7 +94,7 @@ public: void applySettings(); - void stateChanged(QMediaEncoder::State state) { + void stateChanged(QMediaEncoder::RecorderState state) { if (m_mediaEncoder) m_mediaEncoder->stateChanged(state); } @@ -181,7 +181,7 @@ private: QTimer m_notifyTimer; qint64 m_duration; - QMediaEncoder::State m_state; + QMediaEncoder::RecorderState m_state; QMediaEncoder::Status m_status; QUrl m_requestedOutputLocation; QUrl m_usedOutputLocation; diff --git a/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp index eb620a0d9..175528ed4 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp @@ -59,7 +59,7 @@ bool QAndroidMediaEncoder::setOutputLocation(const QUrl &location) return m_session->setOutputLocation(location); } -QMediaEncoder::State QAndroidMediaEncoder::state() const +QMediaEncoder::RecorderState QAndroidMediaEncoder::state() const { return m_session->state(); } @@ -79,7 +79,7 @@ void QAndroidMediaEncoder::applySettings() m_session->applySettings(); } -void QAndroidMediaEncoder::setState(QMediaEncoder::State state) +void QAndroidMediaEncoder::setState(QMediaEncoder::RecorderState state) { m_session->setState(state); } diff --git a/src/multimedia/platform/android/mediacapture/qandroidmediaencoder_p.h b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder_p.h index 35c6c0749..c2a74366e 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidmediaencoder_p.h +++ b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder_p.h @@ -66,7 +66,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; void applySettings() override; @@ -75,7 +75,7 @@ public: void setCaptureSession(QPlatformMediaCaptureSession *session); - void setState(QMediaEncoder::State state) override; + void setState(QMediaEncoder::RecorderState state) override; private: friend class QAndroidCaptureSession; |