diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-29 16:37:31 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-29 16:37:31 -0700 |
| commit | ff10113dd45b6a8cb32ccaf36b2bc768c06ff26a (patch) | |
| tree | d3f9fc3a02171d447eba0d35aa68d8385fb3a1ec /include/ui | |
| parent | b9c8a7349671ed003f40f70412ed0bbacab90931 (diff) | |
| parent | 5579a65263a93786219737f28c7b902ff3bf4529 (diff) | |
| download | frameworks_native-ff10113dd45b6a8cb32ccaf36b2bc768c06ff26a.zip frameworks_native-ff10113dd45b6a8cb32ccaf36b2bc768c06ff26a.tar.gz frameworks_native-ff10113dd45b6a8cb32ccaf36b2bc768c06ff26a.tar.bz2 | |
am 17a80081: Merge change 5544 into donut
Merge commit '17a80081a42410f541a220ab7e6afc64fc6cc399'
* commit '17a80081a42410f541a220ab7e6afc64fc6cc399':
Pipe all the camera callbacks to Java to facilitate the addition
Diffstat (limited to 'include/ui')
| -rw-r--r-- | include/ui/Camera.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/ui/Camera.h b/include/ui/Camera.h index bbc21c4..97e0e90 100644 --- a/include/ui/Camera.h +++ b/include/ui/Camera.h @@ -63,16 +63,12 @@ namespace android { #define FRAME_CALLBACK_FLAG_CAMERA 0x05 #define FRAME_CALLBACK_FLAG_BARCODE_SCANNER 0x07 -// msgType in notifyCallback function +// msgType in notifyCallback and dataCallback functions enum { - CAMERA_MSG_ERROR, + CAMERA_MSG_ERROR = 0, CAMERA_MSG_SHUTTER, CAMERA_MSG_FOCUS, - CAMERA_MSG_ZOOM -}; - -// msgType in dataCallback function -enum { + CAMERA_MSG_ZOOM, CAMERA_MSG_PREVIEW_FRAME, CAMERA_MSG_VIDEO_FRAME, CAMERA_MSG_POSTVIEW_FRAME, |