Dolda2000 GitWeb
/
kaka
/
cakelight.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
03b67a7
)
Refactored some consumers
author
Tomas Wenström
<tomas.wenstrom@gmail.com>
Wed, 29 Mar 2017 18:56:50 +0000
(20:56 +0200)
committer
Tomas Wenström
<tomas.wenstrom@gmail.com>
Wed, 29 Mar 2017 18:56:50 +0000
(20:56 +0200)
src/kaka/cakelight/CakeLight.java
patch
|
blob
|
blame
|
history
src/kaka/cakelight/GuiTest.java
patch
|
blob
|
blame
|
history
src/kaka/cakelight/LedController.java
patch
|
blob
|
blame
|
history
src/kaka/cakelight/VideoMode.java
patch
|
blob
|
blame
|
history
diff --git
a/src/kaka/cakelight/CakeLight.java
b/src/kaka/cakelight/CakeLight.java
index
33e0035
..
5401c0f
100644
(file)
--- a/
src/kaka/cakelight/CakeLight.java
+++ b/
src/kaka/cakelight/CakeLight.java
@@
-13,7
+13,7
@@
public class CakeLight {
public void setMode(Mode mode) {
cleanup();
this.mode = mode;
public void setMode(Mode mode) {
cleanup();
this.mode = mode;
- mode.setFrameListener(ledController);
+ mode.setFrameListener(ledController
::onFrame
);
mode.enter(config);
}
mode.enter(config);
}
diff --git
a/src/kaka/cakelight/GuiTest.java
b/src/kaka/cakelight/GuiTest.java
index
a3cabf4
..
6dbb5ff
100644
(file)
--- a/
src/kaka/cakelight/GuiTest.java
+++ b/
src/kaka/cakelight/GuiTest.java
@@
-58,7
+58,7
@@
public class GuiTest extends Application {
log("Running with config:\n" + config);
cakelight = new CakeLight(config, new LedController() {
@Override
log("Running with config:\n" + config);
cakelight = new CakeLight(config, new LedController() {
@Override
- public void
accept
(LedFrame ledFrame) {
+ public void
onFrame
(LedFrame ledFrame) {
if (!paused) drawLEDs(canvas.getGraphicsContext2D(), ledFrame);
}
});
if (!paused) drawLEDs(canvas.getGraphicsContext2D(), ledFrame);
}
});
diff --git
a/src/kaka/cakelight/LedController.java
b/src/kaka/cakelight/LedController.java
index
9749483
..
201644d
100644
(file)
--- a/
src/kaka/cakelight/LedController.java
+++ b/
src/kaka/cakelight/LedController.java
@@
-1,10
+1,7
@@
package kaka.cakelight;
package kaka.cakelight;
-import java.util.function.Consumer;
-
-public class LedController implements Consumer<LedFrame> {
- @Override
- public void accept(LedFrame ledFrame) {
+public class LedController {
+ public void onFrame(LedFrame ledFrame) {
// TODO
}
}
// TODO
}
}
diff --git
a/src/kaka/cakelight/VideoMode.java
b/src/kaka/cakelight/VideoMode.java
index
e4b9400
..
960f985
100644
(file)
--- 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;
import java.util.Optional;
import java.util.function.Consumer;
-public class VideoMode extends Mode
implements Consumer<Optional<File>>
{
+public class VideoMode extends Mode {
private Configuration config;
private Thread thread;
private Consumer<Frame> frameConsumer;
private Configuration config;
private Thread thread;
private Consumer<Frame> frameConsumer;
@@
-13,7
+13,7
@@
public class VideoMode extends Mode implements Consumer<Optional<File>> {
public VideoMode() {
deviceListener = new VideoDeviceListener();
public VideoMode() {
deviceListener = new VideoDeviceListener();
- deviceListener.onVideoDeviceChange(this);
+ deviceListener.onVideoDeviceChange(this
::onVideoDeviceChange
);
}
@Override
}
@Override
@@
-58,8
+58,7
@@
public class VideoMode extends Mode implements Consumer<Optional<File>> {
frameListener.accept(frame.getLedFrame());
}
frameListener.accept(frame.getLedFrame());
}
- @Override
- public void accept(Optional<File> videoDevice) {
+ public void onVideoDeviceChange(Optional<File> videoDevice) {
// Should only happen when this mode is active!
if (thread != null) {
thread.interrupt();
// Should only happen when this mode is active!
if (thread != null) {
thread.interrupt();