mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-02 23:54:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename menu_entry_get_label to menu_entry_get_path

Browse Source
This commit is contained in:
twinaphex 2015-06-01 15:16:54 +02:00
parent ee6f54baa7
commit 296b359ba1
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/drivers/glui.c
View File

@ -293,17 +293,17 @@ static void glui_render_menu_list(glui_handle_t *glui,
for (i = 0; i < end; i++) for (i = 0; i < end; i++)
{ {
unsigned y; unsigned y;
char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char entry_path[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH];
char message[PATH_MAX_LENGTH], char message[PATH_MAX_LENGTH],
entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH];
bool selected = false; bool selected = false;
selected = menu_entry_is_currently_selected(i); selected = menu_entry_is_currently_selected(i);
menu_entry_get_value(i, entry_value, sizeof(entry_value)); menu_entry_get_value(i, entry_value, sizeof(entry_value));
menu_entry_get_label(i, entry_label, sizeof(entry_label)); menu_entry_get_path(i, entry_path, sizeof(entry_path));
menu_animation_ticker_line(entry_title_buf, glui->ticker_limit, menu_animation_ticker_line(entry_title_buf, glui->ticker_limit,
frame_count / 100, entry_label, selected); frame_count / 100, entry_path, selected);
menu_animation_ticker_line(type_str_buf, glui->ticker_limit, menu_animation_ticker_line(type_str_buf, glui->ticker_limit,
frame_count / 100, entry_value, selected); frame_count / 100, entry_value, selected);

6
menu/drivers/rgui.c
View File

@ -441,7 +441,7 @@ static void rgui_render(void)
for (; i < end; i++, y += FONT_HEIGHT_STRIDE) for (; i < end; i++, y += FONT_HEIGHT_STRIDE)
{ {
char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char entry_path[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH];
char message[PATH_MAX_LENGTH], char message[PATH_MAX_LENGTH],
entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH];
unsigned entry_spacing = menu_entry_get_spacing(i); unsigned entry_spacing = menu_entry_get_spacing(i);
@ -451,10 +451,10 @@ static void rgui_render(void)
continue; continue;
menu_entry_get_value(i, entry_value, sizeof(entry_value)); menu_entry_get_value(i, entry_value, sizeof(entry_value));
menu_entry_get_label(i, entry_label, sizeof(entry_label)); menu_entry_get_path(i, entry_path, sizeof(entry_path));
menu_animation_ticker_line(entry_title_buf, RGUI_TERM_WIDTH - (entry_spacing + 1 + 2), menu_animation_ticker_line(entry_title_buf, RGUI_TERM_WIDTH - (entry_spacing + 1 + 2),
frame_count / RGUI_TERM_START_X, entry_label, entry_selected); frame_count / RGUI_TERM_START_X, entry_path, entry_selected);
menu_animation_ticker_line(type_str_buf, entry_spacing, menu_animation_ticker_line(type_str_buf, entry_spacing,
frame_count / RGUI_TERM_START_X, frame_count / RGUI_TERM_START_X,
entry_value, entry_selected); entry_value, entry_selected);

6
menu/drivers/rmenu.c
View File

@ -189,17 +189,17 @@ static void rmenu_render(void)
for (i = begin; i < end; i++, j++) for (i = begin; i < end; i++, j++)
{ {
char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char entry_path[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH];
char message[PATH_MAX_LENGTH], char message[PATH_MAX_LENGTH],
entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH];
unsigned entry_spacing = menu_entry_get_spacing(i); unsigned entry_spacing = menu_entry_get_spacing(i);
bool entry_selected = menu_entry_is_currently_selected(i); bool entry_selected = menu_entry_is_currently_selected(i);
menu_entry_get_value(i, entry_value, sizeof(entry_value)); menu_entry_get_value(i, entry_value, sizeof(entry_value));
menu_entry_get_label(i, entry_label, sizeof(entry_label)); menu_entry_get_path(i, entry_path, sizeof(entry_path));
menu_animation_ticker_line(entry_title_buf, RMENU_TERM_WIDTH - (entry_spacing + 1 + 2), menu_animation_ticker_line(entry_title_buf, RMENU_TERM_WIDTH - (entry_spacing + 1 + 2),
frame_count / 15, entry_label, entry_selected); frame_count / 15, entry_path, entry_selected);
menu_animation_ticker_line(type_str_buf, entry_spacing, menu_animation_ticker_line(type_str_buf, entry_spacing,
frame_count / 15, entry_value, entry_selected); frame_count / 15, entry_value, entry_selected);

6
menu/drivers/rmenu_xui.cpp
View File

@ -567,14 +567,14 @@ static void rmenu_xui_render(void)
for (i = 0; i < end; i++) for (i = 0; i < end; i++)
{ {
menu_entry_t entry; menu_entry_t entry;
char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char entry_path[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH];
wchar_t msg_left[PATH_MAX_LENGTH], msg_right[PATH_MAX_LENGTH]; wchar_t msg_left[PATH_MAX_LENGTH], msg_right[PATH_MAX_LENGTH];
menu_entry_get(&entry, i, NULL, true); menu_entry_get(&entry, i, NULL, true);
menu_entry_get_value(i, entry_value, sizeof(entry_value)); menu_entry_get_value(i, entry_value, sizeof(entry_value));
menu_entry_get_label(i, entry_label, sizeof(entry_label)); menu_entry_get_path(i, entry_path, sizeof(entry_path));
mbstowcs(msg_left, entry_label, sizeof(msg_left) / sizeof(wchar_t)); mbstowcs(msg_left, entry_path, sizeof(msg_left) / sizeof(wchar_t));
mbstowcs(msg_right, entry_value, sizeof(msg_right) / sizeof(wchar_t)); mbstowcs(msg_right, entry_value, sizeof(msg_right) / sizeof(wchar_t));
rmenu_xui_set_list_text(i, msg_left, msg_right); rmenu_xui_set_list_text(i, msg_left, msg_right);
} }

8
menu/drivers/xmb.c
View File

@ -981,7 +981,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
for (i = 0; i < end; i++) for (i = 0; i < end; i++)
{ {
menu_entry_t entry; menu_entry_t entry;
char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char entry_path[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH];
float icon_x, icon_y; float icon_x, icon_y;
char name[PATH_MAX_LENGTH], value[PATH_MAX_LENGTH]; char name[PATH_MAX_LENGTH], value[PATH_MAX_LENGTH];
GLuint texture_switch = 0; GLuint texture_switch = 0;
@ -1004,10 +1004,10 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
continue; continue;
menu_entry_get(&entry, i, list, true); menu_entry_get(&entry, i, list, true);
menu_entry_get_label(i, entry_label, sizeof(entry_label)); menu_entry_get_path(i, entry_path, sizeof(entry_path));
if (entry.type == MENU_FILE_CONTENTLIST_ENTRY) if (entry.type == MENU_FILE_CONTENTLIST_ENTRY)
strlcpy(entry_label, path_basename(entry_label), sizeof(entry_label)); strlcpy(entry_path, path_basename(entry_path), sizeof(entry_path));
icon = xmb_icon_get_type(xmb, core_node, entry.type); icon = xmb_icon_get_type(xmb, core_node, entry.type);
@ -1033,7 +1033,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
icon = xmb->textures.list[XMB_TEXTURE_RESUME].id; icon = xmb->textures.list[XMB_TEXTURE_RESUME].id;
menu_animation_ticker_line(name, 35, menu_animation_ticker_line(name, 35,
frame_count / 20, entry_label, frame_count / 20, entry_path,
(i == current)); (i == current));
xmb_draw_text(menu, xmb, name, xmb_draw_text(menu, xmb, name,

4
menu/menu_entry.c
View File

@ -193,12 +193,12 @@ enum menu_entry_type menu_entry_get_type(uint32_t i)
return MENU_ENTRY_ACTION; return MENU_ENTRY_ACTION;
} }
void menu_entry_get_label(uint32_t i, char *label, size_t sizeof_label) void menu_entry_get_path(uint32_t i, char *s, size_t len)
{ {
menu_entry_t entry; menu_entry_t entry;
menu_entry_get(&entry, i, NULL, true); menu_entry_get(&entry, i, NULL, true);
strlcpy(label, entry.path, sizeof_label); strlcpy(s, entry.path, len);
} }
unsigned menu_entry_get_spacing(uint32_t i) unsigned menu_entry_get_spacing(uint32_t i)

2
menu/menu_entry.h
View File

@ -63,7 +63,7 @@ rarch_setting_t *menu_entry_get_setting(uint32_t i);
enum menu_entry_type menu_entry_get_type(uint32_t i); enum menu_entry_type menu_entry_get_type(uint32_t i);
void menu_entry_get_label(uint32_t i, char *label, size_t sizeof_label); void menu_entry_get_path(uint32_t i, char *label, size_t sizeof_label);
unsigned menu_entry_get_spacing(uint32_t i); unsigned menu_entry_get_spacing(uint32_t i);