libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-30 03:30:45 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #3413 from fr500/master

Browse Source 
reorder XMB tabs
This commit is contained in:
Twinaphex 2016-08-21 13:09:22 +02:00 committed by GitHub
commit ae9f55d874
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
menu/drivers/xmb.c
View File

@ -117,19 +117,23 @@ enum
{ {
XMB_SYSTEM_TAB_MAIN = 0, XMB_SYSTEM_TAB_MAIN = 0,
XMB_SYSTEM_TAB_SETTINGS, XMB_SYSTEM_TAB_SETTINGS,
XMB_SYSTEM_TAB_HISTORY,
#ifdef HAVE_FFMPEG
XMB_SYSTEM_TAB_VIDEO,
XMB_SYSTEM_TAB_MUSIC,
#endif
#ifdef HAVE_IMAGEVIEWER #ifdef HAVE_IMAGEVIEWER
XMB_SYSTEM_TAB_IMAGES, XMB_SYSTEM_TAB_IMAGES,
#endif #endif
#ifdef HAVE_FFMPEG
XMB_SYSTEM_TAB_MUSIC,
XMB_SYSTEM_TAB_VIDEO,
#endif
XMB_SYSTEM_TAB_HISTORY,
XMB_SYSTEM_TAB_ADD XMB_SYSTEM_TAB_ADD
}; };
#ifdef HAVE_LIBRETRODB #ifdef HAVE_LIBRETRODB
#define XMB_SYSTEM_TAB_END XMB_SYSTEM_TAB_ADD #define XMB_SYSTEM_TAB_END XMB_SYSTEM_TAB_ADD
#elif defined(HAVE_IMAGEVIEWER)
#define XMB_SYSTEM_TAB_END XMB_SYSTEM_TAB_IMAGES
#elif defined(HAVE_FFMPEG)
#define XMB_SYSTEM_TAB_END XMB_SYSTEM_TAB_MUSIC
#else #else
#define XMB_SYSTEM_TAB_END XMB_SYSTEM_TAB_HISTORY #define XMB_SYSTEM_TAB_END XMB_SYSTEM_TAB_HISTORY
#endif #endif
@ -2613,18 +2617,18 @@ static void *xmb_init(void **userdata)
xmb->tabs[xmb->system_tab_end] = XMB_SYSTEM_TAB_MAIN; xmb->tabs[xmb->system_tab_end] = XMB_SYSTEM_TAB_MAIN;
if (settings->menu.xmb.show_settings) if (settings->menu.xmb.show_settings)
xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_SETTINGS; xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_SETTINGS;
if (settings->menu.xmb.show_history)
xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_HISTORY;
#ifdef HAVE_IMAGEVIEWER #ifdef HAVE_IMAGEVIEWER
if (settings->menu.xmb.show_images) if (settings->menu.xmb.show_images)
xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_IMAGES; xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_IMAGES;
#endif #endif
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
if (settings->menu.xmb.show_music)
xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_MUSIC;
if (settings->menu.xmb.show_video) if (settings->menu.xmb.show_video)
xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_VIDEO; xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_VIDEO;
if (settings->menu.xmb.show_music)
xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_MUSIC;
#endif #endif
if (settings->menu.xmb.show_history)
xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_HISTORY;
#ifdef HAVE_LIBRETRODB #ifdef HAVE_LIBRETRODB
xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_ADD; xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_ADD;
#endif #endif