X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fkaka%2Fcakelight%2FConsole.java;h=422b7a38147e14ce26ffcdc1231dcf71fe95c4be;hb=fa013e4bfdfe17f97ddeab2596ae8daa03337e4a;hp=3b66959913a67cb0b3ff2afffd5573adf1c954a8;hpb=eca6fd31ebbf5cc015c0a4acd4f1509de061e3df;p=kaka%2Fcakelight.git

diff --git a/src/kaka/cakelight/Console.java b/src/kaka/cakelight/Console.java
index 3b66959..422b7a3 100644
--- a/src/kaka/cakelight/Console.java
+++ b/src/kaka/cakelight/Console.java
@@ -22,6 +22,14 @@ public class Console extends Thread {
         this.cakelight = cakelight;
 	this.config = config;
 	reader = new BufferedReader(new InputStreamReader(System.in));
+
+    public CakeLight getCakelight() {
+	return cakelight;
+    }
+
+    public Configuration getConfig() {
+	return config;
+    }
     }
 
     @Override
@@ -61,8 +69,9 @@ public class Console extends Thread {
 		    String[] split = input.split("\\s+");
 		    config.video.saturation = Double.parseDouble(split[1]);
 		    System.out.println("setting saturation to " + config.video.saturation);
-		} else if (input.matches("(n|noise)")) {
-		    TwoColorNoiseMode.getCommand().activate(cakelight, config, input.split("\\s+"));
+		} else if (input.matches("(n|noise)(\\s+[a-z0-9]+){2}")) {
+		    TwoColorNoiseMode.getCommand().activate(this, input.split("\\s+"));
+		    System.out.println("setting two-color noise mode");
 		}
             } catch (IOException e) {
                 System.out.println("Error reading from command line");
@@ -73,6 +82,6 @@ public class Console extends Thread {
 
     public interface Command {
         String[] getNames();
-        void activate(CakeLight cakelight, Configuration config, String[] args);
+        void activate(Console console, String[] args);
     }
 }