Synchronize on threads on wait/notify

[kaka/cakelight.git] / src / kaka / cakelight / mode / AmbientMode.java

diff --git a/src/kaka/cakelight/mode/AmbientMode.java b/src/kaka/cakelight/mode/AmbientMode.java
index afe36ab..9843084 100644 (file)
--- a/src/kaka/cakelight/mode/AmbientMode.java
+++ b/src/kaka/cakelight/mode/AmbientMode.java
@@ -7,8 +7,11 @@ import kaka.cakelight.util.SimplexNoise3D;
 
 public class AmbientMode extends Mode { // TODO split into DynamicAmbient and StaticAmbient?
     private Thread thread; // TODO move to a dynamic sub class
-    private Configuration config;
+    protected Configuration config;
     private int type = 0;
+    private boolean isPaused = false;
+
+    AmbientMode() {}
 
     public AmbientMode(String[] args) {
         if (args.length > 0) {
@@ -23,17 +26,35 @@ public class AmbientMode extends Mode { // TODO split into DynamicAmbient and St
     }
 
     @Override
+    public void pause() {
+        isPaused = true;
+    }
+
+    @Override
+    public void resume() {
+        isPaused = false;
+       synchronized (thread) {
+           thread.notify();
+       }
+    }
+
+    @Override
     public void exit() {
         stopThread();
     }
 
-    public void startThread() {
+    private void startThread() {
         thread = new Thread() {
             public void run() {
                 try {
                     long start = System.currentTimeMillis();
                     int index = 0;
                     while (!isInterrupted()) {
+                        if (isPaused) {
+                           synchronized (thread) {
+                               wait();
+                           }
+                        }
                         LedFrame frame = LedFrame.from(config);
                         updateFrame(frame, System.currentTimeMillis() - start, index);
                         updateWithFrame(frame);
@@ -41,13 +62,14 @@ public class AmbientMode extends Mode { // TODO split into DynamicAmbient and St
                         Thread.sleep(20);
                     }
                 } catch (InterruptedException e) {
+                    // e.printStackTrace();
                 }
             }
         };
         thread.start();
     }
 
-    public void stopThread() {
+    private void stopThread() {
         thread.interrupt();
     }
 
@@ -56,7 +78,7 @@ public class AmbientMode extends Mode { // TODO split into DynamicAmbient and St
      * @param time  Time in milliseconds since start
      * @param count Goes from 0 to number of LEDs - 1
      */
-    private void updateFrame(LedFrame frame, long time, int count) {
+    protected void updateFrame(LedFrame frame, long time, int count) {
         if (type == 0) {
             for (int i = 0; i < config.leds.getCount(); i++) {
                 double r = Math.sin(2 * i * Math.PI / config.leds.getCount() + time * 0.001) * 0.5 + 0.5;