summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dave Sparks <davidsparks@android.com> 2009-06-24 10:42:53 -0700
committer Dave Sparks <davidsparks@android.com> 2009-06-24 10:42:53 -0700
commit6f0602e84a0387fe9239a57f44785de40feb051c (patch)
treec4f588848a7caa95565131374fa6419732aeaa63
parentb1dffc48ca8aec61d99391495b3f436d0e8b16dd (diff)
Cleanup header file. Disallow copy of Camera object by making copy
constructor and operator= private.
-rw-r--r--include/ui/Camera.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/ui/Camera.h b/include/ui/Camera.h
index 564a1db4b5dd..bbc21c4910dc 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