diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-24 13:54:13 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-24 13:54:13 -0700 |
| commit | e5b3607a0a7f3eebac82595624efe8d5b07f0a61 (patch) | |
| tree | 849e956c53de45b1abac4517f5ba13d80fab7087 /include | |
| parent | 2387208c9ecb5dba01bd933312c80c5133bd3c41 (diff) | |
| parent | eaa89f74c04c0f10d5f3f8190b457087537bff2e (diff) | |
| download | frameworks_base-e5b3607a0a7f3eebac82595624efe8d5b07f0a61.zip frameworks_base-e5b3607a0a7f3eebac82595624efe8d5b07f0a61.tar.gz frameworks_base-e5b3607a0a7f3eebac82595624efe8d5b07f0a61.tar.bz2 | |
am eaa89f74: Merge change 5172 into donut
Merge commit 'eaa89f74c04c0f10d5f3f8190b457087537bff2e'
* commit 'eaa89f74c04c0f10d5f3f8190b457087537bff2e':
Remove deprecated callback function support.
Diffstat (limited to 'include')
| -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; |