Renamed Frame to VideoFrame

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

diff --git a/src/kaka/cakelight/VideoMode.java b/src/kaka/cakelight/VideoMode.java
index 1f6d68f..134fa2d 100644 (file)
--- a/src/kaka/cakelight/VideoMode.java
+++ b/src/kaka/cakelight/VideoMode.java
@@ -8,7 +8,7 @@ import java.util.function.Consumer;
 public class VideoMode extends Mode {
     private Configuration config;
     private Thread grabberThread;
-    private Consumer<Frame> frameConsumer;
+    private Consumer<VideoFrame> frameConsumer;
     private VideoDeviceListener deviceListener;
 
     public VideoMode() {
@@ -34,9 +34,9 @@ public class VideoMode extends Mode {
             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);
                     }
                 } catch (IOException e) {
@@ -47,11 +47,11 @@ public class VideoMode extends Mode {
         grabberThread.start();
     }
 
-    public void onVideoFrame(Consumer<Frame> consumer) {
+    public void onVideoFrame(Consumer<VideoFrame> consumer) {
         frameConsumer = consumer;
     }
 
-    private void onFrame(Frame frame) {
+    private void onVideoFrame(VideoFrame frame) {
         updateWithFrame(frame.getLedFrame());
     }