X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2Fmode%2FVideoMode.java;h=a8397dc7bce53d40dc29fd511e1a5280f4ee1785;hb=7434e71cc01dde2cc9bde4856f7ec396aa67d535;hp=1f43ffbf7d7da90bfd496452b42697a1bfdf4b1a;hpb=d0afa6fb625ce2fe77d1ed6f0df8ed34391ddc35;p=kaka%2Fcakelight.git

diff --git a/src/kaka/cakelight/mode/VideoMode.java b/src/kaka/cakelight/mode/VideoMode.java
index 1f43ffb..a8397dc 100644
--- a/src/kaka/cakelight/mode/VideoMode.java
+++ b/src/kaka/cakelight/mode/VideoMode.java
@@ -15,6 +15,7 @@ public class VideoMode extends Mode {
     private Thread grabberThread;
     private Consumer<VideoFrame> frameConsumer;
     private VideoDeviceListener deviceListener;
+    private boolean isPaused = false;
 
     public VideoMode() {
         deviceListener = new VideoDeviceListener();
@@ -24,27 +25,33 @@ public class VideoMode extends Mode {
     @Override
     public void enter(Configuration config) {
         this.config = config;
-        deviceListener.startListening();
+        if (config.video.deviceIsAutomatic) {
+            deviceListener.startListening();
+        } else {
+            File videoDevice = new File(config.video.device);
+            startGrabberThread(videoDevice);
+        }
     }
 
     @Override
     public void pause() {
-        try {
-            grabberThread.wait();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
+        isPaused = true;
     }
 
     @Override
     public void resume() {
-        grabberThread.notify();
+        isPaused = false;
+	synchronized (grabberThread) {
+	    grabberThread.notify();
+	}
     }
 
     @Override
     public void exit() {
         grabberThread.interrupt();
-        deviceListener.stopListening();
+        if (config.video.deviceIsAutomatic) {
+            deviceListener.stopListening();
+        }
     }
 
     private void startGrabberThread(File videoDevice) {
@@ -54,11 +61,16 @@ public class VideoMode extends Mode {
                 try (FrameGrabber grabber = FrameGrabber.from(videoDevice, config)) {
                     while (!isInterrupted()) {
                         Optional<VideoFrame> frame = grabber.grabFrame();
+                        if (isPaused) {
+			    synchronized (grabberThread) {
+				wait();
+			    }
+                        }
                         if (frameConsumer != null) frame.ifPresent(frameConsumer);
                         frame.ifPresent(VideoMode.this::onVideoFrame);
 //                        timeIt("frame", grabber::grabFrame);
                     }
-                } catch (IOException e) {
+                } catch (IOException | InterruptedException e) {
                     e.printStackTrace();
                 }
             }