X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2FVideoMode.java;h=6da36f27a6cb946592955ef359b93ffe07fc9bfe;hb=8aea44b5a5b9d56b600146ab305dfeef932772bd;hp=e4b9400ca04b57d6d570fb8c4b4675702d9612f2;hpb=03b67a7377d6d23d517d33e47f338bb7859596ed;p=kaka%2Fcakelight.git diff --git a/src/kaka/cakelight/VideoMode.java b/src/kaka/cakelight/VideoMode.java index e4b9400..6da36f2 100644 --- a/src/kaka/cakelight/VideoMode.java +++ b/src/kaka/cakelight/VideoMode.java @@ -5,7 +5,7 @@ import java.io.IOException; import java.util.Optional; import java.util.function.Consumer; -public class VideoMode extends Mode implements Consumer> { +public class VideoMode extends Mode { private Configuration config; private Thread thread; private Consumer frameConsumer; @@ -13,7 +13,7 @@ public class VideoMode extends Mode implements Consumer> { public VideoMode() { deviceListener = new VideoDeviceListener(); - deviceListener.onVideoDeviceChange(this); + deviceListener.onVideoDeviceChange(this::onVideoDeviceChange); } @Override @@ -54,12 +54,10 @@ public class VideoMode extends Mode implements Consumer> { } private void onFrame(Frame frame) { - assert frameListener != null; - frameListener.accept(frame.getLedFrame()); + updateWithFrame(frame.getLedFrame()); } - @Override - public void accept(Optional videoDevice) { + public void onVideoDeviceChange(Optional videoDevice) { // Should only happen when this mode is active! if (thread != null) { thread.interrupt();