X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2FVideoMode.java;h=134fa2d33ff574f837af3b68dbd7b0e967ddf4ed;hb=adc29b9a70fa1d03ac67b0b3f397fed7a75f4d7b;hp=960f9853a0bb9075dc7fb517b2e0b7640a15b8ea;hpb=d182b8ccdbbbdadc4441170f0135ec98c76f5d17;p=kaka%2Fcakelight.git

diff --git a/src/kaka/cakelight/VideoMode.java b/src/kaka/cakelight/VideoMode.java
index 960f985..134fa2d 100644
--- a/src/kaka/cakelight/VideoMode.java
+++ b/src/kaka/cakelight/VideoMode.java
@@ -7,8 +7,8 @@ import java.util.function.Consumer;
 
 public class VideoMode extends Mode {
     private Configuration config;
-    private Thread thread;
-    private Consumer<Frame> frameConsumer;
+    private Thread grabberThread;
+    private Consumer<VideoFrame> frameConsumer;
     private VideoDeviceListener deviceListener;
 
     public VideoMode() {
@@ -24,44 +24,41 @@ public class VideoMode extends Mode {
 
     @Override
     public void exit() {
-        thread.interrupt();
+        grabberThread.interrupt();
         deviceListener.stopListening();
     }
 
     private void startGrabberThread(File videoDevice) {
         assert frameConsumer != null;
-        thread = new Thread() {
+        grabberThread = new Thread() {
             public void run() {
                 try (FrameGrabber grabber = FrameGrabber.from(videoDevice, config)) {
                     while (!isInterrupted()) {
-                        Optional<Frame> frame = grabber.grabFrame();
+                        Optional<VideoFrame> frame = grabber.grabFrame();
                         if (frameConsumer != null) frame.ifPresent(frameConsumer);
-                        frame.ifPresent(VideoMode.this::onFrame);
+                        frame.ifPresent(VideoMode.this::onVideoFrame);
 //                        timeIt("frame", grabber::grabFrame);
-                        // TODO: process frame
-                        // TODO: save where the LedController can access it
                     }
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
             }
         };
-        thread.start();
+        grabberThread.start();
     }
 
-    public void onVideoFrame(Consumer<Frame> consumer) {
+    public void onVideoFrame(Consumer<VideoFrame> consumer) {
         frameConsumer = consumer;
     }
 
-    private void onFrame(Frame frame) {
-        assert frameListener != null;
-        frameListener.accept(frame.getLedFrame());
+    private void onVideoFrame(VideoFrame frame) {
+        updateWithFrame(frame.getLedFrame());
     }
 
     public void onVideoDeviceChange(Optional<File> videoDevice) {
         // Should only happen when this mode is active!
-        if (thread != null) {
-            thread.interrupt();
+        if (grabberThread != null) {
+            grabberThread.interrupt();
         }
         videoDevice.ifPresent(this::startGrabberThread);
     }