aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeddy Wing2018-10-27 16:15:01 +0200
committerTeddy Wing2018-10-27 16:15:01 +0200
commit72778cbd35eb30784273bfee66923d084c571875 (patch)
tree239b9668789bb49ab372fd24be917892451c5252
parentfb68afe6481ab419d1beb80442de37c395dc5784 (diff)
downloaddome-key-map-72778cbd35eb30784273bfee66923d084c571875.tar.bz2
c_run_key_action(): Remove `mode` argument
This argument is no longer used, as the current mode is tracked in `State`.
-rw-r--r--dome_key_map.h2
-rw-r--r--src/cocoa_bridge.rs16
2 files changed, 2 insertions, 16 deletions
diff --git a/dome_key_map.h b/dome_key_map.h
index d9ba8d8..c5e326b 100644
--- a/dome_key_map.h
+++ b/dome_key_map.h
@@ -36,7 +36,7 @@ typedef struct {
Config *c_parse_args(const char *const *args, size_t length, Config *config_ptr);
-void c_run_key_action(State *state, Trigger trigger, const Trigger *mode);
+void c_run_key_action(State *state, Trigger trigger);
void config_free(Config *ptr);
diff --git a/src/cocoa_bridge.rs b/src/cocoa_bridge.rs
index bec1ecc..3c2b190 100644
--- a/src/cocoa_bridge.rs
+++ b/src/cocoa_bridge.rs
@@ -98,7 +98,6 @@ pub extern "C" fn state_load_map_group(ptr: *mut State) {
pub extern "C" fn c_run_key_action(
state: *mut State,
trigger: Trigger,
- mode: *const Trigger,
) {
let trigger = unsafe {
assert!(!trigger.buttons.is_null());
@@ -106,31 +105,18 @@ pub extern "C" fn c_run_key_action(
slice::from_raw_parts(trigger.buttons, trigger.length as usize)
};
- let mode = unsafe {
- if mode.is_null() {
- None
- } else {
- assert!(!(*mode).buttons.is_null());
-
- Some(
- slice::from_raw_parts((*mode).buttons, (*mode).length as usize)
- )
- }
- };
-
let mut state = unsafe {
assert!(!state.is_null());
&mut *state
};
- run_key_action_for_mode(&mut state, trigger, mode);
+ run_key_action_for_mode(&mut state, trigger);
}
#[no_mangle]
pub extern "C" fn run_key_action_for_mode<'a>(
state: &mut State,
trigger: &'a [HeadphoneButton],
- in_mode: Option<&[HeadphoneButton]>
) {
match state.map_group {
Some(ref map_group) => {