From e49416551302fc61bf08ed511ffb793aaab0186c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 5 May 2015 21:35:25 +0200 Subject: [PATCH] Change menu_display_setting_label --- menu/drivers/glui.c | 2 ++ menu/drivers/rgui.c | 2 ++ menu/drivers/xmb.c | 2 ++ menu/menu_display.c | 2 +- menu/menu_display.h | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index c83454bd8d..99eda29ba7 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -303,6 +303,7 @@ static void glui_render_menu_list(runloop_t *runloop, char message[PATH_MAX_LENGTH], type_str[PATH_MAX_LENGTH], entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH], path_buf[PATH_MAX_LENGTH]; + const char *entry_label = NULL; unsigned type = 0; unsigned w = 0; bool selected = false; @@ -313,6 +314,7 @@ static void glui_render_menu_list(runloop_t *runloop, type_str, sizeof(type_str), path_buf, sizeof(path_buf), NULL, 0, + entry_label, NULL); selected = (i == menu->navigation.selection_ptr); diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 7cc29a1b8a..267d5581b5 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -491,6 +491,7 @@ static void rgui_render(void) char message[PATH_MAX_LENGTH], type_str[PATH_MAX_LENGTH], entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH], path_buf[PATH_MAX_LENGTH]; + const char *entry_label = NULL; unsigned type = 0; unsigned w = 0; bool selected = false; @@ -501,6 +502,7 @@ static void rgui_render(void) type_str, sizeof(type_str), path_buf, sizeof(path_buf), NULL, 0, + entry_label, NULL); selected = (i == menu->navigation.selection_ptr); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index efb6cddb6c..3474a806e3 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1002,6 +1002,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, char entry_label_buf[PATH_MAX_LENGTH]; char type_str[PATH_MAX_LENGTH], path_buf[PATH_MAX_LENGTH]; char name[PATH_MAX_LENGTH], value[PATH_MAX_LENGTH]; + const char *entry_label = NULL; unsigned type = 0; unsigned w = 0; GLuint icon = 0; @@ -1029,6 +1030,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, type_str, sizeof(type_str), path_buf, sizeof(path_buf), entry_label_buf, sizeof(entry_label_buf), + entry_label, list); if (type == MENU_FILE_CONTENTLIST_ENTRY) diff --git a/menu/menu_display.c b/menu/menu_display.c index d1854beec7..24fde775c5 100644 --- a/menu/menu_display.c +++ b/menu/menu_display.c @@ -214,9 +214,9 @@ void menu_display_setting_label(unsigned i, char *type_str, size_t sizeof_type_str, char *path_buf, size_t sizeof_path_buf, char *entry_label_buf, size_t sizeof_entry_label_buf, + const char *entry_label, void *userdata) { - const char *entry_label = NULL; const char *path = NULL; menu_file_list_cbs_t *cbs = NULL; menu_handle_t *menu = menu_driver_get_ptr(); diff --git a/menu/menu_display.h b/menu/menu_display.h index 3cb6ce2912..6a7d3df3f8 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -59,6 +59,7 @@ void menu_display_setting_label(unsigned i, char *type_str, size_t sizeof_type_str, char *path_buf, size_t sizeof_path_buf, char *entry_label_buf, size_t sizeof_entry_label_buf, + const char *entry_label, void *userdata); #ifdef __cplusplus