From 579b748e557235017f438f197b62a9899fe091b8 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Mon, 19 Feb 2007 15:43:50 +0000
Subject: [PATCH] fix Capture constructors

---
 build/shared/revisions.txt              | 17 ++++++++++++++++-
 todo.txt                                |  3 ++-
 video/src/processing/video/Capture.java | 12 ++++++------
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 3ae5175ff..7f6d79e4d 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -13,7 +13,22 @@ Throwing out the baby with the bathwater.
 
 [ changes ] 
 
-+ Changing key command to instead use ctrl/cmd-alt-left/right, 
++ Changed the constructors for the Capture class to be more consistent 
+  with the rest of the video library. The following constructors:
+  Capture(PApplet parent, int width, int height)
+  Capture(PApplet parent, int width, int height, int rate)
+  Capture(PApplet parent, String name, int width, int height)
+  Capture(PApplet parent, String name, int width, int height, int rate)
+  have been changed to:
+  Capture(PApplet parent, int width, int height)
+  Capture(PApplet parent, int width, int height, int rate)
+  Capture(PApplet parent, int width, int height, String name)
+  Capture(PApplet parent, int width, int height, String name, int rate)
+  This version is not particularly consistent:
+  Capture(PApplet parent, int width, int height, int rate)
+  though we'll be leaving it in because it was used so heavily.
+
++ Changing key command to instead use ctrl/cmd + alt + left/right, 
   identical to Firefox on Mac, PC and Linux. Also fixes a bug
   that caused French keyboards to have problems since 0123.
   http://dev.processing.org/bugs/show_bug.cgi?id=480
diff --git a/todo.txt b/todo.txt
index 2551cbb8f..54038ffcf 100644
--- a/todo.txt
+++ b/todo.txt
@@ -16,7 +16,8 @@ X   or the 1.5 versions:
 X   http://java.sun.com/update/1.5.0/jinstall-1_5_0_03-windows-i586.cab
 X PDE does not refresh code when using an External Editor
 X   http://dev.processing.org/bugs/show_bug.cgi?id=515
-X change framerate to frameRate inside Capture
+X change constructors for Capture, also framerate to frameRate
+_   need to update reference
 
 _ need to add reference for moviemaker 
 
diff --git a/video/src/processing/video/Capture.java b/video/src/processing/video/Capture.java
index 637d85de9..2afc76c0f 100755
--- a/video/src/processing/video/Capture.java
+++ b/video/src/processing/video/Capture.java
@@ -106,15 +106,15 @@ public class Capture extends PImage implements Runnable {
 
 
   public Capture(PApplet parent, int requestWidth, int requestHeight) {
-    this(parent, null, requestWidth, requestHeight, 30);
+    this(parent, requestWidth, requestHeight, null, 30);
   }
 
   public Capture(PApplet parent, int reqWidth, int reqHeight, int frameRate) {
-    this(parent, null, reqWidth, reqHeight, frameRate);
+    this(parent, reqWidth, reqHeight, null, frameRate);
   }
 
-  public Capture(PApplet parent, String name, int reqWidth, int reqHeight) {
-    this(parent, name, reqWidth, reqHeight, 30);
+  public Capture(PApplet parent, int reqWidth, int reqHeight, String name) {
+    this(parent, reqWidth, reqHeight, name, 30);
   }
 
 
@@ -135,8 +135,8 @@ public class Capture extends PImage implements Runnable {
    * is defined in the host PApplet, then it will be called every
    * time a new frame is available from the capture device.
    */
-  public Capture(PApplet parent, String name,
-                 int requestWidth, int requestHeight, int frameRate) {
+  public Capture(PApplet parent, int requestWidth, int requestHeight,
+                 String name, int frameRate) {
     this.parent = parent;
     this.name = name;
     this.frameRate = frameRate;