diff options
author | Dave Sparks <davidsparks@android.com> | 2009-06-23 19:09:05 -0700 |
---|---|---|
committer | Dave Sparks <davidsparks@android.com> | 2009-06-24 07:58:27 -0700 |
commit | dc76f7bfa10a037ea0cc0f253022d8de7eefc691 (patch) | |
tree | 50b17db5f387dffadd3e936d35eea9e811e9f2d0 /include/ui/Camera.h | |
parent | bbbc7cb77efba3dd46e9d13fc22e81cff17c35d2 (diff) | |
download | frameworks_native-dc76f7bfa10a037ea0cc0f253022d8de7eefc691.zip frameworks_native-dc76f7bfa10a037ea0cc0f253022d8de7eefc691.tar.gz frameworks_native-dc76f7bfa10a037ea0cc0f253022d8de7eefc691.tar.bz2 |
Remove deprecated callback function support.
This is the last of a 3-part change to modify the camera to use
a more streamlined callback interface. This change removes the
old code.
Bug 1884362
Diffstat (limited to 'include/ui/Camera.h')
-rw-r--r-- | include/ui/Camera.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/include/ui/Camera.h b/include/ui/Camera.h index bd4855c..564a1db 100644 --- a/include/ui/Camera.h +++ b/include/ui/Camera.h @@ -152,14 +152,6 @@ public: // get preview/capture parameters - key/value pairs String8 getParameters() const; - void setShutterCallback(shutter_callback cb, void *cookie); - void setRawCallback(frame_callback cb, void *cookie); - void setJpegCallback(frame_callback cb, void *cookie); - void setRecordingCallback(frame_callback cb, void *cookie); - void setPreviewCallback(frame_callback cb, void *cookie, int preview_callback_flag = FRAME_CALLBACK_FLAG_NOOP); - void setErrorCallback(error_callback cb, void *cookie); - void setAutoFocusCallback(autofocus_callback cb, void *cookie); - void setListener(const sp<CameraListener>& listener); void setPreviewCallbackFlags(int preview_callback_flag); @@ -190,21 +182,6 @@ private: sp<ICamera> mCamera; status_t mStatus; - shutter_callback mShutterCallback; - void *mShutterCallbackCookie; - frame_callback mRawCallback; - void *mRawCallbackCookie; - frame_callback mJpegCallback; - void *mJpegCallbackCookie; - frame_callback mPreviewCallback; - void *mPreviewCallbackCookie; - frame_callback mRecordingCallback; - void *mRecordingCallbackCookie; - error_callback mErrorCallback; - void *mErrorCallbackCookie; - autofocus_callback mAutoFocusCallback; - void *mAutoFocusCallbackCookie; - sp<CameraListener> mListener; friend class DeathNotifier; |