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>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h
index 98dac8ae6..e70e74ef2 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h
+++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h
@@ -72,7 +72,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;
@@ -82,7 +82,7 @@ public:
     void setCaptureSession(QPlatformMediaCaptureSession *session);
 
 public Q_SLOTS:
-    void setState(QMediaEncoder::State state) override;
+    void setState(QMediaEncoder::RecorderState state) override;
 
 private Q_SLOTS:
     void onCameraChanged();
@@ -95,7 +95,7 @@ private:
     QWindowsMediaCaptureService  *m_captureService = nullptr;
     QWindowsMediaDeviceSession   *m_mediaDeviceSession = nullptr;
     QUrl                          m_outputLocation;
-    QMediaEncoder::State          m_state = QMediaEncoder::StoppedState;
+    QMediaEncoder::RecorderState          m_state = QMediaEncoder::StoppedState;
     QMediaEncoder::Status         m_lastStatus = QMediaEncoder::StoppedStatus;
     QMediaEncoderSettings         m_settings;
     QWindowsStorageLocation       m_storageLocation;