diff options
author | Yoann Lopes <yoann.lopes@digia.com> | 2013-02-28 15:28:56 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-28 16:50:37 +0100 |
commit | e747d4c0cd09c0874c7a268b06dd45fadb1111aa (patch) | |
tree | 794bde338cacb942d7f2f5cb8f0e42949d910b7b /src/plugins/gstreamer/camerabin/camerabinfocus.h | |
parent | 339fda0ca9d622f3525b58e91dbf78f65b44bcc2 (diff) | |
download | qtmultimedia-e747d4c0cd09c0874c7a268b06dd45fadb1111aa.tar.gz |
GStreamer: fixed build when using GST_PHOTOGRAPHY.
CameraBinExposure was reimplementing the Qt4 version of
QCameraExposureControl instead of the refactored version of Qt5.
Zoom features were still handled in CameraBinFocus but these have been
moved to their own control in Qt5.
Task-number: QTBUG-29300
Change-Id: I0c71cac6011137bc5457f0d362da44c72039004a
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinfocus.h')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinfocus.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinfocus.h b/src/plugins/gstreamer/camerabin/camerabinfocus.h index 3057a71c3..e1f4dcd36 100644 --- a/src/plugins/gstreamer/camerabin/camerabinfocus.h +++ b/src/plugins/gstreamer/camerabin/camerabinfocus.h @@ -60,16 +60,9 @@ public: CameraBinFocus(CameraBinSession *session); virtual ~CameraBinFocus(); - QCameraFocus::FocusMode focusMode() const; - void setFocusMode(QCameraFocus::FocusMode mode); - bool isFocusModeSupported(QCameraFocus::FocusMode mode) const; - - qreal maximumOpticalZoom() const; - qreal maximumDigitalZoom() const; - qreal opticalZoom() const; - qreal digitalZoom() const; - - void zoomTo(qreal optical, qreal digital) ; + QCameraFocus::FocusModes focusMode() const; + void setFocusMode(QCameraFocus::FocusModes mode); + bool isFocusModeSupported(QCameraFocus::FocusModes mode) const; QCameraFocus::FocusPointMode focusPointMode() const; void setFocusPointMode(QCameraFocus::FocusPointMode mode) ; @@ -95,7 +88,7 @@ private Q_SLOTS: private: CameraBinSession *m_session; - QCameraFocus::FocusMode m_focusMode; + QCameraFocus::FocusModes m_focusMode; QCamera::LockStatus m_focusStatus; QCameraFocusZone::FocusZoneStatus m_focusZoneStatus; }; |