From 33edefb154744959132035e9c254ca1dc292784c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Mon, 24 Nov 2014 14:43:01 +0700 Subject: [PATCH] (XMB) Use MENU_FILE_CONTENTLIST_ENTRY --- menu/disp/xmb.c | 3 +++ menu/menu_common.h | 1 + menu/menu_entries_cbs.c | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/menu/disp/xmb.c b/menu/disp/xmb.c index d83f48be14..e6dcac423b 100644 --- a/menu/disp/xmb.c +++ b/menu/disp/xmb.c @@ -835,6 +835,9 @@ static void xmb_draw_items(file_list_t *list, file_list_t *stack, icon = xmb->textures[XMB_TEXTURE_FILE].id; break; case MENU_FILE_PLAYLIST_ENTRY: + icon = xmb->textures[XMB_TEXTURE_FILE].id; + break; + case MENU_FILE_CONTENTLIST_ENTRY: icon = core_node ? core_node->content_icon : xmb->textures[XMB_TEXTURE_FILE].id; break; case MENU_FILE_CARCHIVE: diff --git a/menu/menu_common.h b/menu/menu_common.h index f4b72abfef..831b6f7907 100644 --- a/menu/menu_common.h +++ b/menu/menu_common.h @@ -65,6 +65,7 @@ typedef enum MENU_FILE_DEVICE, MENU_FILE_CORE, MENU_FILE_PLAYLIST_ENTRY, + MENU_FILE_CONTENTLIST_ENTRY, MENU_FILE_SHADER_PRESET, MENU_FILE_SHADER, MENU_FILE_VIDEOFILTER, diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index c6ec2fd00d..d97d8ebbf3 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -1847,7 +1847,7 @@ static void content_list_push(void *data, core_info_t *info, const char* path) if (list->elems[j].attr.i == RARCH_DIRECTORY) // is a directory content_list_push(flist, info, list->elems[j].data); else - menu_list_push(flist, path_basename(list->elems[j].data), "", MENU_FILE_PLAYLIST_ENTRY, 0); + menu_list_push(flist, path_basename(list->elems[j].data), "", MENU_FILE_CONTENTLIST_ENTRY, 0); } string_list_free(list); @@ -1888,7 +1888,7 @@ static int deferred_push_content_list(void *data, void *userdata, if (!info->supports_no_game) content_list_push(list, info, g_settings.content_directory); else - menu_list_push(list, info->display_name, "", MENU_FILE_PLAYLIST_ENTRY, 0); + menu_list_push(list, info->display_name, "", MENU_FILE_CONTENTLIST_ENTRY, 0); driver.menu->scroll_indices_size = 0; menu_entries_build_scroll_indices(list); @@ -2326,7 +2326,7 @@ static void menu_entries_cbs_init_bind_toggle(menu_file_list_cbs_t *cbs, case MENU_FILE_USE_DIRECTORY: cbs->action_toggle = action_toggle_scroll; break; - case MENU_FILE_PLAYLIST_ENTRY: + case MENU_FILE_CONTENTLIST_ENTRY: cbs->action_toggle = action_toggle_mainmenu; break; }