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 /src/multimedia/platform/android/mediacapture/qandroidmediaencoder.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 'src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp')
-rw-r--r-- | src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |