From 92d591464883009651ee807d5aa7f39b8fd4ec8b Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Mon, 29 Nov 2010 14:41:51 +0100
Subject: [PATCH] Cosmetics cleanup.

---
 .../linphone/core/AndroidCameraRecord.java    | 20 ++++++++-----------
 .../core/AndroidCameraRecordBufferedImpl.java | 12 ++++-------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/org/linphone/core/AndroidCameraRecord.java b/src/org/linphone/core/AndroidCameraRecord.java
index 560f4c947..c691a3176 100644
--- a/src/org/linphone/core/AndroidCameraRecord.java
+++ b/src/org/linphone/core/AndroidCameraRecord.java
@@ -52,7 +52,8 @@ public abstract class AndroidCameraRecord {
 	public void startPreview() { // FIXME throws exception?
 		if (previewStarted) {
 			Log.w(tag, "Already started");
-			return;
+			throw new RuntimeException("Video recorder already started");
+			// return
 		}
 		
 		if (params.surfaceView.getVisibility() != SurfaceView.VISIBLE) {
@@ -91,7 +92,7 @@ public abstract class AndroidCameraRecord {
 			}
 		}
 
-		onSettingParameters(parameters);
+		onSettingCameraParameters(parameters);
 		camera.setParameters(parameters);
 
 
@@ -114,33 +115,28 @@ public abstract class AndroidCameraRecord {
 		previewStarted = true;
 
 		
-		
 		// Register callback to get capture buffer
-		if (storedPreviewCallback != null) {
-			lowLevelSetPreviewCallback(camera, storedPreviewCallback);
-		}
+		lowLevelSetPreviewCallback(camera, storedPreviewCallback);
 		
 		
-		onCameraStarted(camera);
+		onPreviewStarted(camera);
 	}
 	
 
 
 
-	protected void onSettingParameters(Parameters parameters) {
-		
-	}
+	protected void onSettingCameraParameters(Parameters parameters) {}
 
 	/**
 	 * Hook.
 	 * @param camera
 	 */
-	public void onCameraStarted(Camera camera) {}
+	public void onPreviewStarted(Camera camera) {}
 
 	public void storePreviewCallBack(PreviewCallback cb) {
+		this.storedPreviewCallback = cb;
 		if (camera == null) {
 			Log.w(tag, "Capture camera not ready, storing callback");
-			this.storedPreviewCallback = cb;
 			return;
 		}
 		
diff --git a/src/org/linphone/core/AndroidCameraRecordBufferedImpl.java b/src/org/linphone/core/AndroidCameraRecordBufferedImpl.java
index 9445b40ee..f58698df2 100644
--- a/src/org/linphone/core/AndroidCameraRecordBufferedImpl.java
+++ b/src/org/linphone/core/AndroidCameraRecordBufferedImpl.java
@@ -46,18 +46,14 @@ public class AndroidCameraRecordBufferedImpl extends AndroidCameraRecordImpl {
 	}
 	
 	@Override
-	public void onCameraStarted(Camera camera) {
-		super.onCameraStarted(camera);
+	public void onPreviewStarted(Camera camera) {
+		super.onPreviewStarted(camera);
 
 		Size s = camera.getParameters().getPreviewSize();
 		int wishedBufferSize = s.height * s.width * 3 / 2;
 
 		camera.addCallbackBuffer(new byte[wishedBufferSize]);
 		camera.addCallbackBuffer(new byte[wishedBufferSize]);
-/*
-		for (int i=1; i < 30; i++) {
-			camera.addCallbackBuffer(new byte[wishedBufferSize]);
-		}*/
 	}
 	
 	@Override
@@ -67,8 +63,8 @@ public class AndroidCameraRecordBufferedImpl extends AndroidCameraRecordImpl {
 	}
 
 	@Override
-	protected void onSettingParameters(Parameters parameters) {
-		super.onSettingParameters(parameters);
+	protected void onSettingCameraParameters(Parameters parameters) {
+		super.onSettingCameraParameters(parameters);
 		// Only on v8 hardware
 		camera.setDisplayOrientation(90 * orientationCode);
 	}