--- a/camerauis/cameraxui/cxengine/inc/cxeautofocuscontrolsymbian.h Thu May 13 21:30:19 2010 +0300
+++ b/camerauis/cameraxui/cxengine/inc/cxeautofocuscontrolsymbian.h Thu Jul 15 01:55:05 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -27,6 +27,7 @@
//forward declarations
class CxeCameraDevice;
+class CxeSettings;
@@ -41,13 +42,14 @@
Q_OBJECT
public:
- CxeAutoFocusControlSymbian( CxeCameraDevice &cameraDevice );
+ CxeAutoFocusControlSymbian( CxeCameraDevice &cameraDevice, CxeSettings &settings );
virtual ~CxeAutoFocusControlSymbian();
CxeError::Id start(bool soundEnabled = true);
void cancel();
void setMode( CxeAutoFocusControl::Mode newMode );
CxeAutoFocusControl::Mode mode() const;
+ bool isFixedFocusMode(CxeAutoFocusControl::Mode mode) const;
CxeAutoFocusControl::State state() const;
bool supported() const;
@@ -80,7 +82,8 @@
// Handle ECam events
void handleCameraEvent( int eventUid, int error );
- void handleSceneChanged(CxeScene& scene);
+ void handleSceneChanged(CxeScene &scene);
+ void handleSettingValueChanged(const QString &settingId, QVariant newValue);
private:
@@ -92,8 +95,11 @@
CCamera::CCameraAdvancedSettings *mAdvancedSettings; // not owned
CxeAutoFocusControl::Mode mAfMode;
CCamera::CCameraAdvancedSettings::TFocusRange mAFRange;
+ CxeSettings &mSettings;
bool mCancelled;
bool mSoundEnabled;
+ bool mFaceTrackingOverride; //need for temporary override of the AF mode if FT is enabled by user
+ CxeAutoFocusControl::Mode mPreviousAFMode; //for restoring previous AF mode in case of FT override
};
#endif // CXEAUTOFOCUSCONTROLSYMBIAN_H