X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2FVideoMode.java;h=ca0bd53127c4840d6284da99bbf74af428f2e90c;hb=fa0f769bf3338643755de3624aa4b6db53cea6e6;hp=53cf09b5f8076562a2a1f78fcf4525ffbd08b17f;hpb=100b82fe1c5ada6ef2ce768bf7b9f6f469650e11;p=kaka%2Fcakelight.git

diff --git a/src/kaka/cakelight/VideoMode.java b/src/kaka/cakelight/VideoMode.java
index 53cf09b..ca0bd53 100644
--- a/src/kaka/cakelight/VideoMode.java
+++ b/src/kaka/cakelight/VideoMode.java
@@ -1,39 +1,43 @@
 package kaka.cakelight;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.Optional;
 import java.util.function.Consumer;
 
-import static kaka.cakelight.Main.log;
-import static kaka.cakelight.Main.timeIt;
-
-public class VideoMode implements Mode {
+public class VideoMode extends Mode {
     private Configuration config;
     private Thread thread;
     private Consumer<Frame> frameConsumer;
+    private VideoDeviceListener deviceListener;
+
+    public VideoMode() {
+        deviceListener = new VideoDeviceListener();
+        deviceListener.onVideoDeviceChange(this::onVideoDeviceChange);
+    }
 
     @Override
     public void enter(Configuration config) {
         this.config = config;
-        startGrabberThread();
+        deviceListener.startListening();
     }
 
     @Override
     public void exit() {
         thread.interrupt();
+        deviceListener.stopListening();
     }
 
-    private void startGrabberThread() {
+    private void startGrabberThread(File videoDevice) {
         assert frameConsumer != null;
         thread = new Thread() {
             public void run() {
-                try (FrameGrabber grabber = FrameGrabber.from(config)) {
+                try (FrameGrabber grabber = FrameGrabber.from(videoDevice, config)) {
                     while (!isInterrupted()) {
-//                        Optional<Frame> frame = grabber.grabFrame();
-                        grabber.grabFrame().ifPresent(frameConsumer);
+                        Optional<Frame> frame = grabber.grabFrame();
+                        if (frameConsumer != null) frame.ifPresent(frameConsumer);
+                        frame.ifPresent(VideoMode.this::onFrame);
 //                        timeIt("frame", grabber::grabFrame);
-                        // TODO: process frame
-                        // TODO: save where the LedController can access it
                     }
                 } catch (IOException e) {
                     e.printStackTrace();
@@ -43,7 +47,19 @@ public class VideoMode implements Mode {
         thread.start();
     }
 
-    public void onFrame(Consumer<Frame> consumer) {
+    public void onVideoFrame(Consumer<Frame> consumer) {
         frameConsumer = consumer;
     }
+
+    private void onFrame(Frame frame) {
+        updateWithFrame(frame.getLedFrame());
+    }
+
+    public void onVideoDeviceChange(Optional<File> videoDevice) {
+        // Should only happen when this mode is active!
+        if (thread != null) {
+            thread.interrupt();
+        }
+        videoDevice.ifPresent(this::startGrabberThread);
+    }
 }