From 72747f18f5b7bb2ef99e69bf92650a7a80563bfb Mon Sep 17 00:00:00 2001
From: Sandy Noble <sandy.noble@gmail.com>
Date: Tue, 7 May 2013 13:58:57 +0100
Subject: [PATCH] Further removal of webcam.

---
 controlsSetup.pde | 6 +++---
 webcam.pde        | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/controlsSetup.pde b/controlsSetup.pde
index 164363b..e6b483b 100644
--- a/controlsSetup.pde
+++ b/controlsSetup.pde
@@ -736,9 +736,9 @@ List<String> getControlNamesForWebcamPanel()
   controlNames.add(MODE_LIVE_CONFIRM_DRAW);
 //  controlNames.add(MODE_VECTOR_PATH_LENGTH_HIGHPASS_CUTOFF);
 
-  controlNames.add(MODE_SHOW_WEBCAM_RAW_VIDEO);
-  controlNames.add(MODE_FLIP_WEBCAM_INPUT);
-  controlNames.add(MODE_ROTATE_WEBCAM_INPUT);
+//  controlNames.add(MODE_SHOW_WEBCAM_RAW_VIDEO);
+//  controlNames.add(MODE_FLIP_WEBCAM_INPUT);
+//  controlNames.add(MODE_ROTATE_WEBCAM_INPUT);
   return controlNames;
 }
 
diff --git a/webcam.pde b/webcam.pde
index 750a122..72ee8b9 100644
--- a/webcam.pde
+++ b/webcam.pde
@@ -203,7 +203,8 @@ public void webcam_captureCurrentImage(PImage inImage)
 public void webcam_captureCurrentImage()
 {
 //  capturedImage = webcam_buildLiveImage();
-//  webcam_captureCurrentImage(capturedImage);
+  if (getDisplayMachine().imageIsReady())
+    webcam_captureCurrentImage(getDisplayMachine().getImage());
 }
 
 public void webcam_processLoadedImage()