From bafa724e3b515e975ef43d613658808ac572f822 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Sun, 26 Jul 2009 10:28:09 -0700
Subject: [PATCH] Hack to be able to compile after latest donut merge

---
 android/author/android_camera_input.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/android/author/android_camera_input.cpp b/android/author/android_camera_input.cpp
index 7131b89b..69f08614 100644
--- a/android/author/android_camera_input.cpp
+++ b/android/author/android_camera_input.cpp
@@ -87,7 +87,9 @@ AndroidCameraInput::~AndroidCameraInput()
 {
     LOGV("destructor");
     if (mCamera != NULL) {
+#if 0 // JBQ
         mCamera->setRecordingCallback(NULL, this);
+#endif
         ReleaseQueuedFrames();
         if ((mFlags & FLAGS_HOT_CAMERA) == 0) {
             LOGV("camera was cold when we started, stopping preview");
@@ -968,7 +970,9 @@ PVMFStatus AndroidCameraInput::DoStart()
     if (mCamera == NULL) {
         status = PVMFFailure;
     } else {
+#if 0 // JBQ
         mCamera->setRecordingCallback(recording_frame_callback, this);
+#endif
         if (mCamera->startRecording() != NO_ERROR) {
             status = PVMFFailure;
         } else {
@@ -994,7 +998,9 @@ PVMFStatus AndroidCameraInput::DoReset()
     iDataEventCounter = 0;
     if ( (iState == STATE_STARTED) || (iState == STATE_PAUSED) ) {
     if (mCamera != NULL) {
+#if 0 // JBQ
         mCamera->setRecordingCallback(NULL, this);
+#endif
         mCamera->stopRecording();
         ReleaseQueuedFrames();
     }
@@ -1025,7 +1031,9 @@ PVMFStatus AndroidCameraInput::DoStop(const AndroidCameraInputCmd& aCmd)
     LOGV("DoStop");
     iDataEventCounter = 0;
     if (mCamera != NULL) {
+#if 0 // JBQ
     mCamera->setRecordingCallback(NULL, this);
+#endif
     mCamera->stopRecording();
     ReleaseQueuedFrames();
     }
@@ -1119,7 +1127,9 @@ PVMFStatus AndroidCameraInput::SetCamera(const sp<android::ICamera>& camera)
     }
 
     // Connect our client to the camera remote
+#if 0 // JBQ
     mCamera = new Camera(camera);
+#endif
     if (mCamera == NULL) {
         LOGE("Unable to connect to camera");
         return PVMFErrNoResources;
-- 
2.11.0