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

Push some small optimizations to menu_cbs_left.c and menu_cbs_right.c 

too
This commit is contained in:
twinaphex 2017-08-13 00:45:20 +02:00
parent a98e8bc915
commit cb2fd48bb6
2 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
menu/cbs/menu_cbs_left.c
View File

@ -388,7 +388,6 @@ static int bind_left_generic(unsigned type, const char *label,
static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs, static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs,
const char *label, uint32_t label_hash, const char *menu_label) const char *label, uint32_t label_hash, const char *menu_label)
{ {
unsigned i;
if (cbs->setting) if (cbs->setting)
{ {
@ -402,21 +401,25 @@ static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs,
} }
} }
for (i = 0; i < MAX_USERS; i++) if (strstr(label, "input_player") && strstr(label, "_joypad_index"))
{ {
uint32_t label_setting_hash; unsigned i;
char label_setting[128]; for (i = 0; i < MAX_USERS; i++)
{
label_setting[0] = '\0'; uint32_t label_setting_hash;
char label_setting[128];
snprintf(label_setting, sizeof(label_setting), "input_player%d_joypad_index", i + 1); label_setting[0] = '\0';
label_setting_hash = msg_hash_calculate(label_setting);
if (label_hash != label_setting_hash) snprintf(label_setting, sizeof(label_setting), "input_player%d_joypad_index", i + 1);
continue; label_setting_hash = msg_hash_calculate(label_setting);
BIND_ACTION_LEFT(cbs, bind_left_generic); if (label_hash != label_setting_hash)
return 0; continue;
BIND_ACTION_LEFT(cbs, bind_left_generic);
return 0;
}
} }
if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_PLAYLISTS_TAB))) if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_PLAYLISTS_TAB)))

25
menu/cbs/menu_cbs_right.c
View File

@ -488,7 +488,6 @@ static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs,
static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs, static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs,
const char *label, uint32_t label_hash, const char *menu_label) const char *label, uint32_t label_hash, const char *menu_label)
{ {
unsigned i;
if (cbs->setting) if (cbs->setting)
{ {
@ -502,21 +501,25 @@ static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs,
} }
} }
for (i = 0; i < MAX_USERS; i++) if (strstr(label, "input_player") && strstr(label, "_joypad_index"))
{ {
uint32_t label_setting_hash; unsigned i;
char label_setting[128]; for (i = 0; i < MAX_USERS; i++)
{
uint32_t label_setting_hash;
char label_setting[128];
label_setting[0] = '\0'; label_setting[0] = '\0';
snprintf(label_setting, sizeof(label_setting), "input_player%d_joypad_index", i + 1); snprintf(label_setting, sizeof(label_setting), "input_player%d_joypad_index", i + 1);
label_setting_hash = msg_hash_calculate(label_setting); label_setting_hash = msg_hash_calculate(label_setting);
if (label_hash != label_setting_hash) if (label_hash != label_setting_hash)
continue; continue;
BIND_ACTION_RIGHT(cbs, bind_right_generic); BIND_ACTION_RIGHT(cbs, bind_right_generic);
return 0; return 0;
}
} }
if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_PLAYLISTS_TAB))) if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_PLAYLISTS_TAB)))