diff options
Diffstat (limited to 'src/multimedia/platform/gstreamer')
-rw-r--r-- | src/multimedia/platform/gstreamer/mediacapture/qgstreamercamerafocus.cpp | 20 | ||||
-rw-r--r-- | src/multimedia/platform/gstreamer/mediacapture/qgstreamercamerafocus_p.h | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamerafocus.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamerafocus.cpp index beb09a897..b5919bca8 100644 --- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamerafocus.cpp +++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamerafocus.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE QGstreamerCameraFocus::QGstreamerCameraFocus(QGstreamerCamera *session) : QPlatformCameraFocus(session), m_camera(session), - m_focusMode(QCameraFocus::AutoFocus) + m_focusMode(QCamera::FocusModeAuto) { #if QT_CONFIG(gstreamer_photography) auto photography = m_camera->photography(); @@ -69,12 +69,12 @@ QGstreamerCameraFocus::~QGstreamerCameraFocus() { } -QCameraFocus::FocusMode QGstreamerCameraFocus::focusMode() const +QCamera::FocusMode QGstreamerCameraFocus::focusMode() const { return m_focusMode; } -void QGstreamerCameraFocus::setFocusMode(QCameraFocus::FocusMode mode) +void QGstreamerCameraFocus::setFocusMode(QCamera::FocusMode mode) { if (mode == m_focusMode) return; @@ -85,22 +85,22 @@ void QGstreamerCameraFocus::setFocusMode(QCameraFocus::FocusMode mode) GstPhotographyFocusMode photographyMode = GST_PHOTOGRAPHY_FOCUS_MODE_CONTINUOUS_NORMAL; switch (mode) { - case QCameraFocus::FocusModeAutoNear: + case QCamera::FocusModeAutoNear: photographyMode = GST_PHOTOGRAPHY_FOCUS_MODE_MACRO; break; - case QCameraFocus::FocusModeAutoFar: + case QCamera::FocusModeAutoFar: // not quite, but hey :) Q_FALLTHROUGH(); - case QCameraFocus::HyperfocalFocus: + case QCamera::FocusModeHyperfocal: photographyMode = GST_PHOTOGRAPHY_FOCUS_MODE_HYPERFOCAL; break; - case QCameraFocus::FocusModeInfinity: + case QCamera::FocusModeInfinity: photographyMode = GST_PHOTOGRAPHY_FOCUS_MODE_INFINITY; break; - case QCameraFocus::FocusModeManual: + case QCamera::FocusModeManual: photographyMode = GST_PHOTOGRAPHY_FOCUS_MODE_MANUAL; break; - default: // QCameraFocus::FocusModeAuto: + default: // QCamera::FocusModeAuto: break; } @@ -112,7 +112,7 @@ void QGstreamerCameraFocus::setFocusMode(QCameraFocus::FocusMode mode) #endif } -bool QGstreamerCameraFocus::isFocusModeSupported(QCameraFocus::FocusMode mode) const +bool QGstreamerCameraFocus::isFocusModeSupported(QCamera::FocusMode mode) const { Q_UNUSED(mode); diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamerafocus_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamerafocus_p.h index d77f6ff51..e9dd069d5 100644 --- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamerafocus_p.h +++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamerafocus_p.h @@ -75,16 +75,16 @@ public: QGstreamerCameraFocus(QGstreamerCamera *session); virtual ~QGstreamerCameraFocus(); - QCameraFocus::FocusMode focusMode() const override; - void setFocusMode(QCameraFocus::FocusMode mode) override; - bool isFocusModeSupported(QCameraFocus::FocusMode mode) const override; + QCamera::FocusMode focusMode() const override; + void setFocusMode(QCamera::FocusMode mode) override; + bool isFocusModeSupported(QCamera::FocusMode mode) const override; ZoomRange zoomFactorRange() const override; void zoomTo(float newZoomFactor, float rate) override; private: QGstreamerCamera *m_camera; - QCameraFocus::FocusMode m_focusMode; + QCamera::FocusMode m_focusMode; float requestedZoomFactor = 1.; float maxZoomFactor = 1.; }; |