diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-24 15:44:45 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-24 15:44:45 -0700 |
| commit | 6f7e0dbdf6108e8f3664d1aa7ac72691f23a03d4 (patch) | |
| tree | 73e057b644205f7aa512821fa1cf35ddb78b809f /include/ui | |
| parent | 9c73a336c121ae2a1f608700b45d84fed6c49eba (diff) | |
| parent | a93466f5ca41c2ba6c3524c8d1edc2138bf753e3 (diff) | |
| download | frameworks_base-6f7e0dbdf6108e8f3664d1aa7ac72691f23a03d4.zip frameworks_base-6f7e0dbdf6108e8f3664d1aa7ac72691f23a03d4.tar.gz frameworks_base-6f7e0dbdf6108e8f3664d1aa7ac72691f23a03d4.tar.bz2 | |
am a93466f5: Merge change 5220 into donut
Merge commit 'a93466f5ca41c2ba6c3524c8d1edc2138bf753e3'
* commit 'a93466f5ca41c2ba6c3524c8d1edc2138bf753e3':
Cleanup header file. Disallow copy of Camera object by making copy
Diffstat (limited to 'include/ui')
| -rw-r--r-- | include/ui/Camera.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/ui/Camera.h b/include/ui/Camera.h index 564a1db..bbc21c4 100644 --- a/include/ui/Camera.h +++ b/include/ui/Camera.h @@ -94,11 +94,6 @@ public: virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr) = 0; }; -typedef void (*shutter_callback)(void *cookie); -typedef void (*frame_callback)(const sp<IMemory>& mem, void *cookie); -typedef void (*autofocus_callback)(bool focused, void *cookie); -typedef void (*error_callback)(status_t err, void *cookie); - class Camera : public BnCameraClient, public IBinder::DeathRecipient { public: @@ -163,6 +158,8 @@ public: private: Camera(); + Camera(const Camera&); + Camera& operator=(const Camera); virtual void binderDied(const wp<IBinder>& who); class DeathNotifier: public IBinder::DeathRecipient |