X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Ffonbot%2FHeavy.java;h=85aff17016325459fb3f1d748f1b169e76ded185;hb=a646935d0f44af999dca8b068aa9568ed5aab988;hp=c06234d7ac35a2a9ec1e97ab641d970f91840438;hpb=8a4b2f56957b27e42995f3f63cb4b601a4b87dbf;p=fonbot.git

diff --git a/src/ro/ieval/fonbot/Heavy.java b/src/ro/ieval/fonbot/Heavy.java
index c06234d..85aff17 100644
--- a/src/ro/ieval/fonbot/Heavy.java
+++ b/src/ro/ieval/fonbot/Heavy.java
@@ -640,11 +640,15 @@ final class Heavy {
 	 * @param context Context instance
 	 * @param replyTo reply Address
 	 */
-	private static void startCamera(final Context context, final Address replyTo){
+	private static void startCamera(final Context context, final Address replyTo, final int cameraNumber){
 		if(camera!=null)
 			return;
 		try{
-			camera=Camera.open();
+			try{
+				camera=Camera.open(cameraNumber);
+			} catch (Exception ex){
+				camera=Camera.open();
+			}
 		} catch (Exception e){
 			Utils.sendMessage(context, replyTo, cannot_grab_camera);
 		}
@@ -956,7 +960,7 @@ final class Heavy {
 	 * @param on requested flashlight state
 	 */
 	public static void flash(final Context context, final Address replyTo, final boolean on){
-		startCamera(context, replyTo);
+		startCamera(context, replyTo, 0);
 		if(camera==null)
 			return;
 		final Camera.Parameters parms=camera.getParameters();
@@ -1103,11 +1107,12 @@ final class Heavy {
 	 *
 	 * @param context Context instance
 	 * @param replyTo reply Address
+	 * @param cameraNumber camera to take photo with
 	 * @param hostname server hostname
 	 * @param port server port
 	 */
-	public static void photo(final Context context, final Address replyTo, final String hostname, final int port){
-		startCamera(context, replyTo);
+	public static void photo(final Context context, final Address replyTo, final int cameraNumber, final String hostname, final int port){
+		startCamera(context, replyTo, cameraNumber);
 		if(camera==null)
 			return;
 		final Camera.Parameters parms=camera.getParameters();