From dc76f7bfa10a037ea0cc0f253022d8de7eefc691 Mon Sep 17 00:00:00 2001 From: Dave Sparks Date: Tue, 23 Jun 2009 19:09:05 -0700 Subject: 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 --- include/ui/Camera.h | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'include') diff --git a/include/ui/Camera.h b/include/ui/Camera.h index bd4855ce6b..564a1db4b5 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& listener); void setPreviewCallbackFlags(int preview_callback_flag); @@ -190,21 +182,6 @@ private: sp 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 mListener; friend class DeathNotifier; -- cgit v1.2.3-59-g8ed1b