diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-05-17 14:13:54 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-05-18 08:44:27 +0000 |
commit | d78a921256b50399cead644d69d2a06d43ef3e5c (patch) | |
tree | 9e50e522fd048f4fffff9e6669e090b640819f4d /src/multimedia/platform/gstreamer/mediacapture/qgstreamercamerafocus.cpp | |
parent | ac2f3c0ef78e8374dea63b658959a8a6db890bca (diff) |
Merge the QCameraFocus API into QCamera
After API review, we decided that one large API in QCamera is
easier than having separate sub-objects that are only trying to
structure the API.
Change-Id: I5f820a580db1ddb3f47e11b88ca86215997f96ce
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/multimedia/platform/gstreamer/mediacapture/qgstreamercamerafocus.cpp')
-rw-r--r-- | src/multimedia/platform/gstreamer/mediacapture/qgstreamercamerafocus.cpp | 20 |
1 files changed, 10 insertions, 10 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); |