summaryrefslogtreecommitdiffstats
path: root/src/multimedia/platform/windows
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/platform/windows')
-rw-r--r--src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp4
-rw-r--r--src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp
index 56aab5c5e..536ba0176 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp
+++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp
@@ -67,7 +67,7 @@ bool QWindowsMediaEncoder::setOutputLocation(const QUrl &location)
return location.scheme() == QLatin1String("file") || location.scheme().isEmpty();
}
-QMediaEncoder::State QWindowsMediaEncoder::state() const
+QMediaEncoder::RecorderState QWindowsMediaEncoder::state() const
{
return m_state;
}
@@ -95,7 +95,7 @@ void QWindowsMediaEncoder::applySettings()
m_mediaDeviceSession->setVideoSettings(m_settings);
}
-void QWindowsMediaEncoder::setState(QMediaEncoder::State state)
+void QWindowsMediaEncoder::setState(QMediaEncoder::RecorderState state)
{
if (!m_captureService || !m_mediaDeviceSession) {
qWarning() << Q_FUNC_INFO << "Encoder is not set to a capture session";
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;