Revert "ref: use generic instead of Box for Pedal::action"

This reverts commit 3199baab9c.
v0.1.1
rrr-marble 5 years ago
parent 3199baab9c
commit 78a39cecdb

@ -14,27 +14,21 @@ fn main() -> () {
let side_handle = std::thread::spawn(|| {
let pedal = Pedal {
key: evdev::Key::BTN_SIDE,
action: || println!("BTN_SIDE"),
action: Box::new(|| println!("BTN_SIDE")),
};
loop {
if D.get_key_state().unwrap().contains(pedal.key) {
(&pedal.action)();
(*pedal.action)();
}
std::thread::sleep(std::time::Duration::from_millis(100));
}
});
let extra_handle = std::thread::spawn(|| {
let pedal = Pedal {
key: evdev::Key::BTN_EXTRA,
action: || println!("BTN_EXTRA"),
};
loop {
if D.get_key_state().unwrap().contains(pedal.key) {
(&pedal.action)();
let extra_handle = std::thread::spawn(|| loop {
if D.get_key_state().unwrap().contains(evdev::Key::BTN_EXTRA) {
println!("BTN_EXTRA");
}
std::thread::sleep(std::time::Duration::from_millis(100));
}
});
extra_handle.join().expect("Couldn't join");
@ -62,7 +56,7 @@ fn pick_device() -> evdev::Device {
}
}
struct Pedal<F: Fn() -> ()> {
struct Pedal {
key: evdev::Key,
action: F,
action: Box<dyn Fn() -> ()>,
}

Loading…
Cancel
Save