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

Rename action_select to action_info

This commit is contained in:
twinaphex 2015-05-31 22:40:26 +02:00
parent 5b728a32aa
commit bd1e5d6a67
11 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -343,7 +343,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
menu/menu_entries_cbs_ok.o \ menu/menu_entries_cbs_ok.o \
menu/menu_entries_cbs_cancel.o \ menu/menu_entries_cbs_cancel.o \
menu/menu_entries_cbs_start.o \ menu/menu_entries_cbs_start.o \
menu/menu_entries_cbs_select.o \ menu/menu_entries_cbs_info.o \
menu/menu_entries_cbs_refresh.o \ menu/menu_entries_cbs_refresh.o \
menu/menu_entries_cbs_left.o \ menu/menu_entries_cbs_left.o \
menu/menu_entries_cbs_right.o \ menu/menu_entries_cbs_right.o \

2
menu/menu_displaylist.c
View File

@ -2029,7 +2029,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
{ {
case DISPLAYLIST_NONE: case DISPLAYLIST_NONE:
break; break;
case DISPLAYLIST_SELECT: case DISPLAYLIST_INFO:
menu_list_push(info->list, info->path, info->label, info->type, info->directory_ptr); menu_list_push(info->list, info->path, info->label, info->type, info->directory_ptr);
break; break;
case DISPLAYLIST_GENERIC: case DISPLAYLIST_GENERIC:

2
menu/menu_displaylist.h
View File

@ -30,7 +30,7 @@ extern "C" {
enum enum
{ {
DISPLAYLIST_NONE = 0, DISPLAYLIST_NONE = 0,
DISPLAYLIST_SELECT, DISPLAYLIST_INFO,
DISPLAYLIST_HELP, DISPLAYLIST_HELP,
DISPLAYLIST_MAIN_MENU, DISPLAYLIST_MAIN_MENU,
DISPLAYLIST_GENERIC, DISPLAYLIST_GENERIC,

2
menu/menu_entries_cbs.c
View File

@ -193,7 +193,7 @@ void menu_entries_cbs_init(void *data,
menu_entries_cbs_init_bind_cancel(cbs, path, label, type, idx, elem0, elem1); menu_entries_cbs_init_bind_cancel(cbs, path, label, type, idx, elem0, elem1);
menu_entries_cbs_init_bind_scan(cbs, path, label, type, idx, elem0, elem1); menu_entries_cbs_init_bind_scan(cbs, path, label, type, idx, elem0, elem1);
menu_entries_cbs_init_bind_start(cbs, path, label, type, idx, elem0, elem1); menu_entries_cbs_init_bind_start(cbs, path, label, type, idx, elem0, elem1);
menu_entries_cbs_init_bind_select(cbs, path, label, type, idx, elem0, elem1); menu_entries_cbs_init_bind_info(cbs, path, label, type, idx, elem0, elem1);
menu_entries_cbs_init_bind_content_list_switch(cbs, path, label, type, idx, elem0, elem1); menu_entries_cbs_init_bind_content_list_switch(cbs, path, label, type, idx, elem0, elem1);
menu_entries_cbs_init_bind_up(cbs, path, label, type, idx, elem0, elem1); menu_entries_cbs_init_bind_up(cbs, path, label, type, idx, elem0, elem1);
menu_entries_cbs_init_bind_down(cbs, path, label, type, idx, elem0, elem1); menu_entries_cbs_init_bind_down(cbs, path, label, type, idx, elem0, elem1);

2
menu/menu_entries_cbs.h
View File

@ -57,7 +57,7 @@ void menu_entries_cbs_init_bind_down(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx, const char *path, const char *label, unsigned type, size_t idx,
const char *elem0, const char *elem1); const char *elem0, const char *elem1);
void menu_entries_cbs_init_bind_select(menu_file_list_cbs_t *cbs, void menu_entries_cbs_init_bind_info(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx, const char *path, const char *label, unsigned type, size_t idx,
const char *elem0, const char *elem1); const char *elem0, const char *elem1);

8
menu/menu_entries_cbs_select.c → menu/menu_entries_cbs_info.c
View File

@ -16,7 +16,7 @@
#include "menu.h" #include "menu.h"
#include "menu_entries_cbs.h" #include "menu_entries_cbs.h"
static int action_select_default(unsigned type, const char *label) static int action_info_default(unsigned type, const char *label)
{ {
menu_displaylist_info_t info = {0}; menu_displaylist_info_t info = {0};
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
@ -26,15 +26,15 @@ static int action_select_default(unsigned type, const char *label)
strlcpy(info.label, "info_screen", sizeof(info.label)); strlcpy(info.label, "info_screen", sizeof(info.label));
info.directory_ptr = menu->navigation.selection_ptr; info.directory_ptr = menu->navigation.selection_ptr;
return menu_displaylist_push_list(&info, DISPLAYLIST_SELECT); return menu_displaylist_push_list(&info, DISPLAYLIST_HELP);
} }
void menu_entries_cbs_init_bind_select(menu_file_list_cbs_t *cbs, void menu_entries_cbs_init_bind_info(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx, const char *path, const char *label, unsigned type, size_t idx,
const char *elem0, const char *elem1) const char *elem0, const char *elem1)
{ {
if (!cbs) if (!cbs)
return; return;
cbs->action_select = action_select_default; cbs->action_info = action_info_default;
} }

4
menu/menu_entries_cbs_iterate.c
View File

@ -351,7 +351,7 @@ static int action_iterate_menu_viewport(char *s, size_t len, const char *label,
info.type = MENU_SETTINGS_CUSTOM_VIEWPORT; info.type = MENU_SETTINGS_CUSTOM_VIEWPORT;
info.directory_ptr = menu->navigation.selection_ptr; info.directory_ptr = menu->navigation.selection_ptr;
menu_displaylist_push_list(&info, DISPLAYLIST_SELECT); menu_displaylist_push_list(&info, DISPLAYLIST_INFO);
} }
break; break;
@ -366,7 +366,7 @@ static int action_iterate_menu_viewport(char *s, size_t len, const char *label,
info.type = 0; info.type = 0;
info.directory_ptr = menu->navigation.selection_ptr; info.directory_ptr = menu->navigation.selection_ptr;
menu_displaylist_push_list(&info, DISPLAYLIST_SELECT); menu_displaylist_push_list(&info, DISPLAYLIST_INFO);
} }
break; break;

2
menu/menu_entries_cbs_ok.c
View File

@ -953,7 +953,7 @@ static int action_ok_compressed_archive_push(const char *path,
strlcpy(info.path, path, sizeof(info.path)); strlcpy(info.path, path, sizeof(info.path));
strlcpy(info.label, "load_open_zip", sizeof(info.label)); strlcpy(info.label, "load_open_zip", sizeof(info.label));
return menu_displaylist_push_list(&info, DISPLAYLIST_SELECT); return menu_displaylist_push_list(&info, DISPLAYLIST_INFO);
} }
static int action_ok_directory_push(const char *path, static int action_ok_directory_push(const char *path,

4
menu/menu_entry.c
View File

@ -495,8 +495,8 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action)
ret = cbs->action_right(entry->type, entry->label, false); ret = cbs->action_right(entry->type, entry->label, false);
break; break;
case MENU_ACTION_SELECT: case MENU_ACTION_SELECT:
if (cbs && cbs->action_select) if (cbs && cbs->action_info)
ret = cbs->action_select(entry->type, entry->label); ret = cbs->action_info(entry->type, entry->label);
break; break;
case MENU_ACTION_REFRESH: case MENU_ACTION_REFRESH:

4
menu/menu_input.c
View File

@ -399,7 +399,7 @@ static int menu_input_set_bind_mode_common(rarch_setting_t *setting,
info.directory_ptr = nav->selection_ptr; info.directory_ptr = nav->selection_ptr;
strlcpy(info.label, "custom_bind", sizeof(info.label)); strlcpy(info.label, "custom_bind", sizeof(info.label));
menu_displaylist_push_list(&info, DISPLAYLIST_SELECT); menu_displaylist_push_list(&info, DISPLAYLIST_INFO);
break; break;
case MENU_INPUT_BIND_ALL: case MENU_INPUT_BIND_ALL:
menu->binds.target = &settings->input.binds menu->binds.target = &settings->input.binds
@ -412,7 +412,7 @@ static int menu_input_set_bind_mode_common(rarch_setting_t *setting,
info.directory_ptr = nav->selection_ptr; info.directory_ptr = nav->selection_ptr;
strlcpy(info.label, "custom_bind_all", sizeof(info.label)); strlcpy(info.label, "custom_bind_all", sizeof(info.label));
menu_displaylist_push_list(&info, DISPLAYLIST_SELECT); menu_displaylist_push_list(&info, DISPLAYLIST_INFO);
break; break;
} }
return 0; return 0;

2
menu/menu_list.h
View File

@ -43,7 +43,7 @@ typedef struct menu_file_list_cbs
int (*action_scan)(const char *path, const char *label, unsigned type, int (*action_scan)(const char *path, const char *label, unsigned type,
size_t idx); size_t idx);
int (*action_start)(unsigned type, const char *label); int (*action_start)(unsigned type, const char *label);
int (*action_select)(unsigned type, const char *label); int (*action_info)(unsigned type, const char *label);
int (*action_content_list_switch)(void *data, void *userdata, const char int (*action_content_list_switch)(void *data, void *userdata, const char
*path, const char *label, unsigned type); *path, const char *label, unsigned type);
int (*action_left)(unsigned type, const char *label, bool wraparound); int (*action_left)(unsigned type, const char *label, bool wraparound);