From 902c096eb4cfff93f77e592721a46179e9ac6773 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 27 Oct 2016 11:13:31 +0200 Subject: [PATCH] Further changes to bring it in line with menu_input branch --- runloop.c | 8 +------- runloop.h | 5 +++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/runloop.c b/runloop.c index 67fa0d2fb0..b54f2de19f 100644 --- a/runloop.c +++ b/runloop.c @@ -88,14 +88,8 @@ #define DEFAULT_EXT "" #endif -#define runloop_cmd_triggered(trigger_input, id) (BIT64_GET(trigger_input, id)) - -#define runloop_cmd_press(current_input, id) BIT64_GET(current_input, id) -#define runloop_cmd_pressed(old_input, id) BIT64_GET(old_input, id) #ifdef HAVE_MENU -#define runloop_cmd_menu_press(current_input, old_input, trigger_input) (BIT64_GET(trigger_input, RARCH_MENU_TOGGLE) || \ - runloop_cmd_get_state_menu_toggle_button_combo( \ - settings, current_input, old_input, trigger_input)) +#define runloop_cmd_menu_press(current_input, old_input, trigger_input) (BIT64_GET(trigger_input, RARCH_MENU_TOGGLE) || runloop_cmd_get_state_menu_toggle_button_combo(settings, current_input, old_input, trigger_input)) #endif static rarch_system_info_t runloop_system; diff --git a/runloop.h b/runloop.h index 46ddbe558b..dd2d1ea1d3 100644 --- a/runloop.h +++ b/runloop.h @@ -26,6 +26,11 @@ #include "input/input_defines.h" +#define runloop_cmd_triggered(trigger_input, id) (BIT64_GET(trigger_input, id)) + +#define runloop_cmd_press(current_input, id) (BIT64_GET(current_input, id)) +#define runloop_cmd_pressed(old_input, id) (BIT64_GET(old_input, id)) + RETRO_BEGIN_DECLS enum runloop_ctl_state