1 files changed, 0 insertions, 190 deletions

diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
index 700ce2928..d1160d274 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
@@ -64,8 +64,6 @@ QAndroidCameraControl::QAndroidCameraControl(QAndroidCameraSession *session)
     connect(m_cameraSession, SIGNAL(captureModeChanged(QCamera::CaptureModes)),
             this, SIGNAL(captureModeChanged(QCamera::CaptureModes)));
 
-    connect(m_cameraSession, SIGNAL(opened()), this, SLOT(onCameraOpened()));
-
     m_recalculateTimer = new QTimer(this);
     m_recalculateTimer->setInterval(1000);
     m_recalculateTimer->setSingleShot(true);
@@ -135,109 +133,6 @@ bool QAndroidCameraControl::canChangeProperty(PropertyChangeType changeType, QCa
     }
 }
 
-
-QCamera::LockTypes QAndroidCameraControl::supportedLocks() const
-{
-    return m_supportedLocks;
-}
-
-QCamera::LockStatus QAndroidCameraControl::lockStatus(QCamera::LockType lock) const
-{
-    if (!m_supportedLocks.testFlag(lock) || !m_cameraSession->camera())
-        return QCamera::Unlocked;
-
-    if (lock == QCamera::LockFocus)
-        return m_focusLockStatus;
-
-    if (lock == QCamera::LockExposure)
-        return m_exposureLockStatus;
-
-    if (lock == QCamera::LockWhiteBalance)
-        return m_whiteBalanceLockStatus;
-
-    return QCamera::Unlocked;
-}
-
-void QAndroidCameraControl::searchAndLock(QCamera::LockTypes locks)
-{
-    if (!m_cameraSession->camera())
-        return;
-
-    // filter out unsupported locks
-    locks &= m_supportedLocks;
-
-    if (locks.testFlag(QCamera::LockFocus)) {
-        QString focusMode = m_cameraSession->camera()->getFocusMode();
-        if (focusMode == QLatin1String("auto")
-                || focusMode == QLatin1String("macro")
-                || focusMode == QLatin1String("continuous-picture")
-                || focusMode == QLatin1String("continuous-video")) {
-
-            if (m_focusLockStatus == QCamera::Searching)
-                m_cameraSession->camera()->cancelAutoFocus();
-            else
-                setFocusLockStatus(QCamera::Searching, QCamera::UserRequest);
-
-            m_cameraSession->camera()->autoFocus();
-
-        } else {
-            setFocusLockStatus(QCamera::Locked, QCamera::LockAcquired);
-        }
-    }
-
-    if (locks.testFlag(QCamera::LockExposure) && m_exposureLockStatus != QCamera::Searching) {
-        if (m_cameraSession->camera()->getAutoExposureLock()) {
-            // if already locked, unlock and give some time to recalculate exposure
-            m_cameraSession->camera()->setAutoExposureLock(false);
-            setExposureLockStatus(QCamera::Searching, QCamera::UserRequest);
-        } else {
-            m_cameraSession->camera()->setAutoExposureLock(true);
-            setExposureLockStatus(QCamera::Locked, QCamera::LockAcquired);
-        }
-    }
-
-    if (locks.testFlag(QCamera::LockWhiteBalance) && m_whiteBalanceLockStatus != QCamera::Searching) {
-        if (m_cameraSession->camera()->getAutoWhiteBalanceLock()) {
-            // if already locked, unlock and give some time to recalculate white balance
-            m_cameraSession->camera()->setAutoWhiteBalanceLock(false);
-            setWhiteBalanceLockStatus(QCamera::Searching, QCamera::UserRequest);
-        } else {
-            m_cameraSession->camera()->setAutoWhiteBalanceLock(true);
-            setWhiteBalanceLockStatus(QCamera::Locked, QCamera::LockAcquired);
-        }
-    }
-
-    if (m_exposureLockStatus == QCamera::Searching || m_whiteBalanceLockStatus == QCamera::Searching)
-        m_recalculateTimer->start();
-}
-
-void QAndroidCameraControl::unlock(QCamera::LockTypes locks)
-{
-    if (!m_cameraSession->camera())
-        return;
-
-    if (m_recalculateTimer->isActive())
-        m_recalculateTimer->stop();
-
-    // filter out unsupported locks
-    locks &= m_supportedLocks;
-
-    if (locks.testFlag(QCamera::LockFocus)) {
-        m_cameraSession->camera()->cancelAutoFocus();
-        setFocusLockStatus(QCamera::Unlocked, QCamera::UserRequest);
-    }
-
-    if (locks.testFlag(QCamera::LockExposure)) {
-        m_cameraSession->camera()->setAutoExposureLock(false);
-        setExposureLockStatus(QCamera::Unlocked, QCamera::UserRequest);
-    }
-
-    if (locks.testFlag(QCamera::LockWhiteBalance)) {
-        m_cameraSession->camera()->setAutoWhiteBalanceLock(false);
-        setWhiteBalanceLockStatus(QCamera::Unlocked, QCamera::UserRequest);
-    }
-}
-
 QCameraFocusControl *QAndroidCameraControl::focusControl()
 {
     return m_cameraSession->focusControl();
@@ -253,89 +148,4 @@ QCameraImageProcessingControl *QAndroidCameraControl::imageProcessingControl()
     return m_cameraSession->imageProcessingControl();
 }
 
-void QAndroidCameraControl::onCameraOpened()
-{
-    m_supportedLocks = QCamera::NoLock;
-    m_focusLockStatus = QCamera::Unlocked;
-    m_exposureLockStatus = QCamera::Unlocked;
-    m_whiteBalanceLockStatus = QCamera::Unlocked;
-
-    // check if focus lock is supported
-    QStringList focusModes = m_cameraSession->camera()->getSupportedFocusModes();
-    for (int i = 0; i < focusModes.size(); ++i) {
-        const QString &focusMode = focusModes.at(i);
-        if (focusMode == QLatin1String("auto")
-                || focusMode == QLatin1String("continuous-picture")
-                || focusMode == QLatin1String("continuous-video")
-                || focusMode == QLatin1String("macro")) {
-
-            m_supportedLocks |= QCamera::LockFocus;
-            setFocusLockStatus(QCamera::Unlocked, QCamera::UserRequest);
-
-            connect(m_cameraSession->camera(), SIGNAL(autoFocusComplete(bool)),
-                    this, SLOT(onCameraAutoFocusComplete(bool)));
-
-            break;
-        }
-    }
-
-    if (m_cameraSession->camera()->isAutoExposureLockSupported()) {
-        m_supportedLocks |= QCamera::LockExposure;
-        setExposureLockStatus(QCamera::Unlocked, QCamera::UserRequest);
-    }
-
-    if (m_cameraSession->camera()->isAutoWhiteBalanceLockSupported()) {
-        m_supportedLocks |= QCamera::LockWhiteBalance;
-        setWhiteBalanceLockStatus(QCamera::Unlocked, QCamera::UserRequest);
-
-        connect(m_cameraSession->camera(), SIGNAL(whiteBalanceChanged()),
-                this, SLOT(onWhiteBalanceChanged()));
-    }
-}
-
-void QAndroidCameraControl::onCameraAutoFocusComplete(bool success)
-{
-    m_focusLockStatus = success ? QCamera::Locked : QCamera::Unlocked;
-    QCamera::LockChangeReason reason = success ? QCamera::LockAcquired : QCamera::LockFailed;
-    emit lockStatusChanged(QCamera::LockFocus, m_focusLockStatus, reason);
-}
-
-void QAndroidCameraControl::onRecalculateTimeOut()
-{
-    if (m_exposureLockStatus == QCamera::Searching) {
-        m_cameraSession->camera()->setAutoExposureLock(true);
-        setExposureLockStatus(QCamera::Locked, QCamera::LockAcquired);
-    }
-
-    if (m_whiteBalanceLockStatus == QCamera::Searching) {
-        m_cameraSession->camera()->setAutoWhiteBalanceLock(true);
-        setWhiteBalanceLockStatus(QCamera::Locked, QCamera::LockAcquired);
-    }
-}
-
-void QAndroidCameraControl::onWhiteBalanceChanged()
-{
-    // changing the white balance mode releases the white balance lock
-    if (m_whiteBalanceLockStatus != QCamera::Unlocked)
-        setWhiteBalanceLockStatus(QCamera::Unlocked, QCamera::LockLost);
-}
-
-void QAndroidCameraControl::setFocusLockStatus(QCamera::LockStatus status, QCamera::LockChangeReason reason)
-{
-    m_focusLockStatus = status;
-    emit lockStatusChanged(QCamera::LockFocus, m_focusLockStatus, reason);
-}
-
-void QAndroidCameraControl::setWhiteBalanceLockStatus(QCamera::LockStatus status, QCamera::LockChangeReason reason)
-{
-    m_whiteBalanceLockStatus = status;
-    emit lockStatusChanged(QCamera::LockWhiteBalance, m_whiteBalanceLockStatus, reason);
-}
-
-void QAndroidCameraControl::setExposureLockStatus(QCamera::LockStatus status, QCamera::LockChangeReason reason)
-{
-    m_exposureLockStatus = status;
-    emit lockStatusChanged(QCamera::LockExposure, m_exposureLockStatus, reason);
-}
-
 QT_END_NAMESPACE