ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(menu_entries_cbs_{left|right}.c) Further cleanups

This commit is contained in:
twinaphex 2015-06-07 18:44:42 +02:00
parent 04a0585bbe
commit 1c854cd76f
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
menu/menu_entries_cbs_left.c
View File

@ -344,10 +344,19 @@ static int bind_left_generic(unsigned type, const char *label,
} }
static int menu_entries_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs, static int menu_entries_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs,
const char *label, uint32_t label_hash) const char *label, uint32_t label_hash, const char *elem0)
{ {
unsigned i; unsigned i;
if (label)
{
if (menu_entries_common_is_settings_entry(elem0))
{
cbs->action_left = action_left_scroll;
return 0;
}
}
for (i = 0; i < MAX_USERS; i++) for (i = 0; i < MAX_USERS; i++)
{ {
char label_setting[PATH_MAX_LENGTH]; char label_setting[PATH_MAX_LENGTH];
@ -470,18 +479,9 @@ int menu_entries_cbs_init_bind_left(menu_file_list_cbs_t *cbs,
if (!cbs) if (!cbs)
return -1; return -1;
if (label)
{
if (menu_entries_common_is_settings_entry(elem0))
{
cbs->action_left = action_left_scroll;
return 0;
}
}
cbs->action_left = bind_left_generic; cbs->action_left = bind_left_generic;
if (menu_entries_cbs_init_bind_left_compare_label(cbs, label, label_hash) == 0) if (menu_entries_cbs_init_bind_left_compare_label(cbs, label, label_hash, elem0) == 0)
return 0; return 0;
if (menu_entries_cbs_init_bind_left_compare_type(cbs, type, menu_label_hash) == 0) if (menu_entries_cbs_init_bind_left_compare_type(cbs, type, menu_label_hash) == 0)

22
menu/menu_entries_cbs_right.c
View File

@ -416,10 +416,19 @@ static int menu_entries_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *c
} }
static int menu_entries_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs, static int menu_entries_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs,
const char *label, uint32_t label_hash, uint32_t menu_label_hash) const char *label, uint32_t label_hash, uint32_t menu_label_hash, const char *elem0)
{ {
unsigned i; unsigned i;
if (label)
{
if (menu_entries_common_is_settings_entry(elem0))
{
cbs->action_right = action_right_scroll;
return 0;
}
}
for (i = 0; i < MAX_USERS; i++) for (i = 0; i < MAX_USERS; i++)
{ {
char label_setting[PATH_MAX_LENGTH]; char label_setting[PATH_MAX_LENGTH];
@ -473,18 +482,9 @@ int menu_entries_cbs_init_bind_right(menu_file_list_cbs_t *cbs,
if (!cbs) if (!cbs)
return -1; return -1;
if (label)
{
if (menu_entries_common_is_settings_entry(elem0))
{
cbs->action_right = action_right_scroll;
return 0;
}
}
cbs->action_right = bind_right_generic; cbs->action_right = bind_right_generic;
if (menu_entries_cbs_init_bind_right_compare_label(cbs, label, label_hash, menu_label_hash) == 0) if (menu_entries_cbs_init_bind_right_compare_label(cbs, label, label_hash, menu_label_hash, elem0) == 0)
return 0; return 0;
if (menu_entries_cbs_init_bind_right_compare_type(cbs, type, menu_label_hash) == 0) if (menu_entries_cbs_init_bind_right_compare_type(cbs, type, menu_label_hash) == 0)