diff -r 699651f2666f -r 5c1e3c6aa4ef camerauis/cameraxui/cxengine/inc/api/cxeautofocuscontrol.h --- a/camerauis/cameraxui/cxengine/inc/api/cxeautofocuscontrol.h Thu May 27 12:43:29 2010 +0300 +++ b/camerauis/cameraxui/cxengine/inc/api/cxeautofocuscontrol.h Fri Jun 11 13:26:48 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" @@ -34,7 +34,7 @@ { Q_OBJECT public: - + /* * Autofocus control states. */ @@ -42,71 +42,76 @@ { //! focusing InProgress = 0x01, - + //! Autofocus Failed Failed = 0x02, - + //! Focused Ready = 0x04, - + //! State after successfully canceling AF or during startup Unknown = 0x08, - + //! Starting to cancel any pending AF requests Canceling = 0x10 // Starting to Cancel any pending AF requests }; - + // TODO: Check if we have to get all the supported modes from adaptation. enum Mode { //! AF mode: Auto Auto, - + //! AF mode: Hyperfocal Hyperfocal, - + //! AF mode: Macro Macro, - + //! AF mode: Infinity Infinity, - + //! AF mode: Portrait Portrait }; - + /** * Starts Autofocus. * \param soundEnabled indicates if the auto focus sound should be played */ virtual CxeError::Id start(bool soundEnabled = true) = 0; - + /** * Cancels Autofocus. */ virtual void cancel() = 0; // cancels active start operation - + /** * Setting Autofocus Mode. */ virtual void setMode( Mode newMode ) = 0; // sets default value for current view/mode - + /** * Get current Autofocus mode. */ virtual Mode mode() const = 0; - + + /** + * Is the mode a fixed focus mode. + */ + virtual bool isFixedFocusMode(Mode mode) const = 0; + /** * Get current Autofocus state. */ virtual State state() const = 0; // returns current AF state, one of AutoFocusState - + /** * Check if Autofocus is Supported or Not. */ virtual bool supported() const = 0; // true when AF is supported - + /** * Check if auto focus sound is enabled */