diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 07313e4de4..03c4935da1 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -212,9 +212,6 @@ static bool menu_driver_pending_quit = false; * be enacted upon the next menu iteration */ static bool menu_driver_pending_shutdown = false; -/* Are we binding a button inside the menu? */ -static bool menu_driver_is_binding = false; - static menu_handle_t *menu_driver_data = NULL; static const menu_ctx_driver_t *menu_driver_ctx = NULL; static void *menu_userdata = NULL; @@ -1745,15 +1742,6 @@ bool menu_display_reset_textures_list( return true; } -bool menu_driver_is_binding_state(void) -{ - return menu_driver_is_binding; -} - -void menu_driver_set_binding_state(bool on) -{ - menu_driver_is_binding = on; -} /** * menu_driver_find_handle: diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 58c86c8037..c5fddb8db3 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -505,10 +505,6 @@ const char *menu_driver_ident(void); bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data); -bool menu_driver_is_binding_state(void); - -void menu_driver_set_binding_state(bool on); - void menu_driver_frame(video_frame_info_t *video_info); bool menu_driver_get_load_content_animation_data(menu_texture_item *icon, char **playlist_name); diff --git a/retroarch.c b/retroarch.c index 914dd68d01..2906cdb92d 100644 --- a/retroarch.c +++ b/retroarch.c @@ -924,6 +924,8 @@ static menu_input_t menu_input_state; /* Is the menu driver still running? */ static bool menu_driver_alive = false; +/* Are we binding a button inside the menu? */ +static bool menu_driver_is_binding = false; void menu_driver_set_alive(bool val) { @@ -936,6 +938,15 @@ bool menu_driver_is_alive(void) return menu_driver_alive; } +bool menu_driver_is_binding_state(void) +{ + return menu_driver_is_binding; +} + +void menu_driver_set_binding_state(bool on) +{ + menu_driver_is_binding = on; +} #endif /* RECORDING GLOBAL VARIABLES */ @@ -22915,7 +22926,7 @@ static enum runloop_state runloop_check_state( bool pause_nonactive = settings->bools.pause_nonactive; bool rarch_is_initialized = rarch_is_inited; #ifdef HAVE_MENU - bool menu_driver_binding_state = menu_driver_is_binding_state(); + bool menu_driver_binding_state = menu_driver_is_binding; bool menu_is_alive = menu_driver_alive; unsigned menu_toggle_gamepad_combo = settings->uints.input_menu_toggle_gamepad_combo; #ifdef HAVE_EASTEREGG diff --git a/retroarch.h b/retroarch.h index d6756e2af4..5752377d70 100644 --- a/retroarch.h +++ b/retroarch.h @@ -2105,6 +2105,11 @@ void menu_driver_set_alive(bool val); bool menu_driver_is_alive(void); +bool menu_driver_is_binding_state(void); + +void menu_driver_set_binding_state(bool on); + + RETRO_END_DECLS #endif