summaryrefslogtreecommitdiffstats
path: root/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-06-11 11:06:25 +0200
committerLars Knoll <lars.knoll@qt.io>2021-06-16 08:56:48 +0200
commit994bcb23af8399485ddfdd16d2ba34c20326b432 (patch)
tree6eab8c28f89c82382321becde133f8dba885bd81 /src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp
parent52c8d7efdd4f783097dcec6e66f3e076cdbc88ca (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 'src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp')
-rw-r--r--src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp4
1 files changed, 2 insertions, 2 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;