Merge pull request #1877 from lakkatv/xmb

(XMB) Display music icon
This commit is contained in:
Twinaphex 2015-06-30 18:12:52 +02:00
commit a912ca097f
2 changed files with 9 additions and 0 deletions

View File

@ -82,6 +82,7 @@ enum
XMB_TEXTURE_FILE, XMB_TEXTURE_FILE,
XMB_TEXTURE_FOLDER, XMB_TEXTURE_FOLDER,
XMB_TEXTURE_ZIP, XMB_TEXTURE_ZIP,
XMB_TEXTURE_MUSIC,
XMB_TEXTURE_CORE, XMB_TEXTURE_CORE,
XMB_TEXTURE_RDB, XMB_TEXTURE_RDB,
XMB_TEXTURE_CURSOR, XMB_TEXTURE_CURSOR,
@ -1086,6 +1087,8 @@ static GLuint xmb_icon_get_id(xmb_handle_t *xmb,
return xmb->textures.list[XMB_TEXTURE_FILE].id; return xmb->textures.list[XMB_TEXTURE_FILE].id;
case MENU_FILE_CARCHIVE: case MENU_FILE_CARCHIVE:
return xmb->textures.list[XMB_TEXTURE_ZIP].id; return xmb->textures.list[XMB_TEXTURE_ZIP].id;
case MENU_FILE_MUSIC:
return xmb->textures.list[XMB_TEXTURE_MUSIC].id;
case MENU_FILE_CORE: case MENU_FILE_CORE:
return xmb->textures.list[XMB_TEXTURE_CORE].id; return xmb->textures.list[XMB_TEXTURE_CORE].id;
case MENU_FILE_RDB: case MENU_FILE_RDB:
@ -1263,6 +1266,8 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
break; break;
case MENU_VALUE_DIR: case MENU_VALUE_DIR:
break; break;
case MENU_VALUE_MUSIC:
break;
case MENU_VALUE_ON: case MENU_VALUE_ON:
if (xmb->textures.list[XMB_TEXTURE_SWITCH_ON].id) if (xmb->textures.list[XMB_TEXTURE_SWITCH_ON].id)
texture_switch = xmb->textures.list[XMB_TEXTURE_SWITCH_ON].id; texture_switch = xmb->textures.list[XMB_TEXTURE_SWITCH_ON].id;
@ -2032,6 +2037,9 @@ static void xmb_context_reset_textures(xmb_handle_t *xmb, const char *iconpath)
case XMB_TEXTURE_ZIP: case XMB_TEXTURE_ZIP:
fill_pathname_join(path, iconpath, "zip.png", sizeof(path)); fill_pathname_join(path, iconpath, "zip.png", sizeof(path));
break; break;
case XMB_TEXTURE_MUSIC:
fill_pathname_join(path, iconpath, "music.png", sizeof(path));
break;
case XMB_TEXTURE_CORE: case XMB_TEXTURE_CORE:
fill_pathname_join(path, iconpath, "core.png", sizeof(path)); fill_pathname_join(path, iconpath, "core.png", sizeof(path));
break; break;

View File

@ -479,6 +479,7 @@ extern "C" {
#define MENU_VALUE_TRUE 0x7c9e9fe5U #define MENU_VALUE_TRUE 0x7c9e9fe5U
#define MENU_VALUE_FALSE 0x0f6bcef0U #define MENU_VALUE_FALSE 0x0f6bcef0U
#define MENU_VALUE_COMP 0x6a166ba5U #define MENU_VALUE_COMP 0x6a166ba5U
#define MENU_VALUE_MUSIC 0xc4a73997U
#define MENU_VALUE_CORE 0x6a167f7fU #define MENU_VALUE_CORE 0x6a167f7fU
#define MENU_VALUE_CURSOR 0x57bba8b4U #define MENU_VALUE_CURSOR 0x57bba8b4U
#define MENU_VALUE_FILE 0x6a496536U #define MENU_VALUE_FILE 0x6a496536U