mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move menu_driver_is_binding_state to retroarch.c

Browse Source
This commit is contained in:
twinaphex 2019-08-09 21:41:10 +02:00
parent b0f088d5fd
commit e51b93993b
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/menu_driver.c
View File

@ -212,9 +212,6 @@ static bool menu_driver_pending_quit = false;
* be enacted upon the next menu iteration */ * be enacted upon the next menu iteration */
static bool menu_driver_pending_shutdown = false; 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 menu_handle_t *menu_driver_data = NULL;
static const menu_ctx_driver_t *menu_driver_ctx = NULL; static const menu_ctx_driver_t *menu_driver_ctx = NULL;
static void *menu_userdata = NULL; static void *menu_userdata = NULL;
@ -1745,15 +1742,6 @@ bool menu_display_reset_textures_list(
return true; 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: * menu_driver_find_handle:

4
menu/menu_driver.h
View File

@ -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_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); 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); bool menu_driver_get_load_content_animation_data(menu_texture_item *icon, char **playlist_name);

13
retroarch.c
View File

@ -924,6 +924,8 @@ static menu_input_t menu_input_state;
/* Is the menu driver still running? */ /* Is the menu driver still running? */
static bool menu_driver_alive = false; 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) void menu_driver_set_alive(bool val)
{ {
@ -936,6 +938,15 @@ bool menu_driver_is_alive(void)
return menu_driver_alive; 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 #endif
/* RECORDING GLOBAL VARIABLES */ /* RECORDING GLOBAL VARIABLES */
@ -22915,7 +22926,7 @@ static enum runloop_state runloop_check_state(
bool pause_nonactive = settings->bools.pause_nonactive; bool pause_nonactive = settings->bools.pause_nonactive;
bool rarch_is_initialized = rarch_is_inited; bool rarch_is_initialized = rarch_is_inited;
#ifdef HAVE_MENU #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; bool menu_is_alive = menu_driver_alive;
unsigned menu_toggle_gamepad_combo = settings->uints.input_menu_toggle_gamepad_combo; unsigned menu_toggle_gamepad_combo = settings->uints.input_menu_toggle_gamepad_combo;
#ifdef HAVE_EASTEREGG #ifdef HAVE_EASTEREGG

5
retroarch.h
View File

@ -2105,6 +2105,11 @@ void menu_driver_set_alive(bool val);
bool menu_driver_is_alive(void); bool menu_driver_is_alive(void);
bool menu_driver_is_binding_state(void);
void menu_driver_set_binding_state(bool on);
RETRO_END_DECLS RETRO_END_DECLS
#endif #endif