diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-06 16:32:44 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-06 16:32:44 -0400 |
commit | 962f253665e0c5cc8a29de9e59ce3992dad02440 (patch) | |
tree | a2d73b43e89d0123d33c6f309c5fc3b3cd2cf169 /include/ui/Camera.h | |
parent | f83d9b3fcd74f2528b0acc74185d2d7bdd716942 (diff) | |
parent | 36f68b8f24df906c969581b0b8e1a47f95dc03cb (diff) | |
download | frameworks_base-962f253665e0c5cc8a29de9e59ce3992dad02440.zip frameworks_base-962f253665e0c5cc8a29de9e59ce3992dad02440.tar.gz frameworks_base-962f253665e0c5cc8a29de9e59ce3992dad02440.tar.bz2 |
Merge change I547cff66 into eclair
* changes:
Add zoom functions and sendCommand.
Diffstat (limited to 'include/ui/Camera.h')
-rw-r--r-- | include/ui/Camera.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/ui/Camera.h b/include/ui/Camera.h index 9ceb8fd..5219772 100644 --- a/include/ui/Camera.h +++ b/include/ui/Camera.h @@ -78,6 +78,12 @@ enum { CAMERA_MSG_ALL_MSGS = 0x1FF }; +// cmdType in sendCommand functions +enum { + CAMERA_CMD_START_SMOOTH_ZOOM = 1, + CAMERA_CMD_STOP_SMOOTH_ZOOM = 2, +}; + // camera fatal errors enum { CAMERA_ERROR_UKNOWN = 1, @@ -155,6 +161,9 @@ public: // get preview/capture parameters - key/value pairs String8 getParameters() const; + // send command to camera driver + status_t sendCommand(int32_t cmd, int32_t arg1, int32_t arg2); + void setListener(const sp<CameraListener>& listener); void setPreviewCallbackFlags(int preview_callback_flag); |