From beea50b6c0b30b40abd292a11ded570ec50228a4 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Tue, 28 Aug 2018 21:02:51 +0200 Subject: c_run_key_action(): Change signature to take a `Trigger` Our new `Trigger` type groups together the two arguments this function used to take into a single type. --- src/cocoa_bridge.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/cocoa_bridge.rs b/src/cocoa_bridge.rs index 12b2b62..12b0095 100644 --- a/src/cocoa_bridge.rs +++ b/src/cocoa_bridge.rs @@ -61,13 +61,12 @@ pub struct CKeyActionResult { #[no_mangle] pub extern "C" fn c_run_key_action( - trigger: *const HeadphoneButton, - length: size_t, + trigger: Trigger, ) -> *const CKeyActionResult { let trigger = unsafe { - assert!(!trigger.is_null()); + assert!(!trigger.buttons.is_null()); - slice::from_raw_parts(trigger, length as usize) + slice::from_raw_parts(trigger.buttons, trigger.length as usize) }; let result = match run_key_action(trigger) { -- cgit v1.2.3