Only pass console to command on activate

[kaka/cakelight.git] / src / kaka / cakelight / Console.java

diff --git a/src/kaka/cakelight/Console.java b/src/kaka/cakelight/Console.java
index cd48f49..422b7a3 100644 (file)
--- a/src/kaka/cakelight/Console.java
+++ b/src/kaka/cakelight/Console.java
@@ -1,5 +1,10 @@
 package kaka.cakelight;
 
+import kaka.cakelight.mode.AmbientMode;
+import kaka.cakelight.mode.SingleColorMode;
+import kaka.cakelight.mode.TwoColorNoiseMode;
+import kaka.cakelight.mode.VideoMode;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -17,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
@@ -47,14 +60,18 @@ public class Console extends Thread {
                    );
                    cakelight.setMode(new SingleColorMode(c));
                    System.out.println("setting color to " + c);
-               } else if (input.matches("g|gamma\\s+[0-9.]+")) {
+               } else if (input.matches("(g|gamma)\\s+[0-9.]+")) {
                    String[] split = input.split("\\s+");
                    config.gamma = Double.parseDouble(split[1]);
+                   Color.calculateGammaCorrection(config.gamma);
                    System.out.println("setting gamma to " + config.gamma);
-               } else if (input.matches("s|saturation\\s+[0-9.]+")) {
+               } else if (input.matches("(s|saturation)\\s+[0-9.]+")) {
                    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)(\\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");
@@ -62,4 +79,9 @@ public class Console extends Thread {
             }
         }
     }
+
+    public interface Command {
+        String[] getNames();
+        void activate(Console console, String[] args);
+    }
 }