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

Rename MENU_ACTION_TEST to MENU_ACTION_SCAN

This commit is contained in:
twinaphex 2015-05-26 01:10:27 +02:00
parent 5d1e7a7aec
commit 23a861ad1f
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/menu_entries_cbs_iterate.c
View File

@ -155,6 +155,7 @@ static int action_iterate_help(char *s, size_t len, const char *label)
RARCH_MENU_TOGGLE, RARCH_MENU_TOGGLE,
RARCH_QUIT_KEY, RARCH_QUIT_KEY,
RETRO_DEVICE_ID_JOYPAD_X, RETRO_DEVICE_ID_JOYPAD_X,
RETRO_DEVICE_ID_JOYPAD_Y,
}; };
char desc[ARRAY_SIZE(binds)][64]; char desc[ARRAY_SIZE(binds)][64];
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
@ -188,6 +189,7 @@ static int action_iterate_help(char *s, size_t len, const char *label)
"Enter/Exit Menu: %-20s\n" "Enter/Exit Menu: %-20s\n"
" Exit RetroArch: %-20s\n" " Exit RetroArch: %-20s\n"
"Toggle Keyboard: %-20s\n" "Toggle Keyboard: %-20s\n"
" Scan: %-20s\n"
" \n" " \n"
"To run content:\n" "To run content:\n"
@ -199,7 +201,7 @@ static int action_iterate_help(char *s, size_t len, const char *label)
" \n" " \n"
"Press Accept/OK to continue.", "Press Accept/OK to continue.",
desc[0], desc[1], desc[2], desc[3], desc[4], desc[5], desc[6], desc[7]); desc[0], desc[1], desc[2], desc[3], desc[4], desc[5], desc[6], desc[7], desc[8]);
return 0; return 0;
} }

2
menu/menu_entry.c
View File

@ -515,7 +515,7 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action)
menu_input_search_start(); menu_input_search_start();
break; break;
case MENU_ACTION_TEST: case MENU_ACTION_SCAN:
rarch_main_data_msg_queue_push(DATA_TYPE_DB, "/home/squarepusher/roms", "cb_db_scan", 0, 1, rarch_main_data_msg_queue_push(DATA_TYPE_DB, "/home/squarepusher/roms", "cb_db_scan", 0, 1,
true); true);
break; break;

2
menu/menu_input.c
View File

@ -1014,7 +1014,7 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
else if (trigger_input & (1ULL << settings->menu_search_btn)) else if (trigger_input & (1ULL << settings->menu_search_btn))
ret = MENU_ACTION_SEARCH; ret = MENU_ACTION_SEARCH;
else if (trigger_input & (1ULL << RETRO_DEVICE_ID_JOYPAD_Y)) else if (trigger_input & (1ULL << RETRO_DEVICE_ID_JOYPAD_Y))
ret = MENU_ACTION_TEST; ret = MENU_ACTION_SCAN;
else if (trigger_input & (1ULL << settings->menu_default_btn)) else if (trigger_input & (1ULL << settings->menu_default_btn))
ret = MENU_ACTION_START; ret = MENU_ACTION_START;
else if (trigger_input & (1ULL << settings->menu_info_btn)) else if (trigger_input & (1ULL << settings->menu_info_btn))

2
menu/menu_input.h
View File

@ -32,7 +32,7 @@ typedef enum menu_action
MENU_ACTION_RIGHT, MENU_ACTION_RIGHT,
MENU_ACTION_OK, MENU_ACTION_OK,
MENU_ACTION_SEARCH, MENU_ACTION_SEARCH,
MENU_ACTION_TEST, MENU_ACTION_SCAN,
MENU_ACTION_CANCEL, MENU_ACTION_CANCEL,
MENU_ACTION_REFRESH, MENU_ACTION_REFRESH,
MENU_ACTION_SELECT, MENU_ACTION_SELECT,