diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-07-18 10:32:16 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-18 05:56:15 +0200 |
| commit | 1403a1c7be7892ad4d1c5d04c143a318055fb36b (patch) | |
| tree | 22a4caf3f5a119dcb12874ee72d2a9bb7dd88a55 /src/plugins/gstreamer/camerabin/camerabinfocus.cpp | |
| parent | 7085775a115421e5fbecc02679da1558c5178e84 (diff) | |
Remove some obsolete bits.
They can be updated again later when things are more stable, if needed.
Change-Id: I73bdacdd3d1fd43a60cd3a0c14b925fa9c32ee27
Reviewed-on: http://codereview.qt.nokia.com/1724
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinfocus.cpp')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinfocus.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinfocus.cpp b/src/plugins/gstreamer/camerabin/camerabinfocus.cpp index a243c9d..253638c 100644 --- a/src/plugins/gstreamer/camerabin/camerabinfocus.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinfocus.cpp @@ -101,26 +101,16 @@ qreal CameraBinFocus::opticalZoom() const qreal CameraBinFocus::digitalZoom() const { -#ifdef Q_WS_MAEMO_5 - gint zoomFactor = 0; - g_object_get(GST_BIN(m_session->cameraBin()), "zoom", &zoomFactor, NULL); - return zoomFactor/100.0; -#else gfloat zoomFactor = 1.0; g_object_get(GST_BIN(m_session->cameraBin()), "zoom", &zoomFactor, NULL); return zoomFactor; -#endif } void CameraBinFocus::zoomTo(qreal optical, qreal digital) { Q_UNUSED(optical); digital = qBound(qreal(1.0), digital, qreal(10.0)); -#ifdef Q_WS_MAEMO_5 - g_object_set(GST_BIN(m_session->cameraBin()), "zoom", qRound(digital*100.0), NULL); -#else g_object_set(GST_BIN(m_session->cameraBin()), "zoom", digital, NULL); -#endif emit digitalZoomChanged(digital); } @@ -223,13 +213,6 @@ void CameraBinFocus::_q_handleCameraStateChange(QCamera::State state) void CameraBinFocus::_q_handleCapturedImage() { -#ifdef Q_WS_MAEMO_5 - //N900 lost focus after image capture - if (m_focusStatus != QCamera::Unlocked) { - m_focusStatus = QCamera::Unlocked; - emit _q_focusStatusChanged(QCamera::Unlocked, QCamera::LockLost); - } -#endif } void CameraBinFocus::_q_startFocusing() |