mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 13:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add DISPLAYLIST_FILE_BROWSER_SELECT_COLLECTION

Browse Source
This commit is contained in:
twinaphex 2016-07-08 23:20:48 +02:00
parent 6cb11da46b
commit 2dac910964
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/cbs/menu_cbs_ok.c
View File

@ -312,7 +312,7 @@ int generic_action_ok_displaylist_push(const char *path,
info.directory_ptr = idx; info.directory_ptr = idx;
info_path = settings->directory.playlist; info_path = settings->directory.playlist;
info_label = label; info_label = label;
dl_type = DISPLAYLIST_GENERIC; dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_COLLECTION;
break; break;
case ACTION_OK_DL_RDB_ENTRY: case ACTION_OK_DL_RDB_ENTRY:
fill_pathname_join_delim(tmp, fill_pathname_join_delim(tmp,

32
menu/menu_displaylist.c
View File

@ -3209,7 +3209,8 @@ enum filebrowser_enums
FILEBROWSER_NONE = 0, FILEBROWSER_NONE = 0,
FILEBROWSER_SELECT_DIR, FILEBROWSER_SELECT_DIR,
FILEBROWSER_SELECT_FILE, FILEBROWSER_SELECT_FILE,
FILEBROWSER_SELECT_CORE FILEBROWSER_SELECT_CORE,
FILEBROWSER_SELECT_COLLECTION
}; };
static unsigned filebrowser_types = 0; static unsigned filebrowser_types = 0;
@ -3393,26 +3394,16 @@ static int menu_displaylist_parse_generic(
file_type = is_dir ? FILE_TYPE_DIRECTORY : FILE_TYPE_CORE; file_type = is_dir ? FILE_TYPE_DIRECTORY : FILE_TYPE_CORE;
} }
else else if (BIT32_GET(filebrowser_types, FILEBROWSER_SELECT_COLLECTION))
{ {
/* Push type further down in the chain. if (is_dir && !horizontal)
* Needed for shader manager currently. */ file_type = FILE_TYPE_DIRECTORY;
switch (hash_label) else if (is_dir && horizontal)
{ continue;
case MENU_LABEL_CONTENT_COLLECTION_LIST: else
if (is_dir && !horizontal) file_type = FILE_TYPE_PLAYLIST_COLLECTION;
file_type = FILE_TYPE_DIRECTORY;
else if (is_dir && horizontal)
continue;
else
file_type = FILE_TYPE_PLAYLIST_COLLECTION;
break;
default:
break;
}
} }
if (settings->multimedia.builtin_mediaplayer_enable || if (settings->multimedia.builtin_mediaplayer_enable ||
settings->multimedia.builtin_imageviewer_enable) settings->multimedia.builtin_imageviewer_enable)
{ {
@ -3859,6 +3850,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
BIT32_CLEAR_ALL(filebrowser_types); BIT32_CLEAR_ALL(filebrowser_types);
BIT32_SET(filebrowser_types, FILEBROWSER_SELECT_CORE); BIT32_SET(filebrowser_types, FILEBROWSER_SELECT_CORE);
break; break;
case DISPLAYLIST_FILE_BROWSER_SELECT_COLLECTION:
BIT32_CLEAR_ALL(filebrowser_types);
BIT32_SET(filebrowser_types, FILEBROWSER_SELECT_COLLECTION);
break;
case DISPLAYLIST_GENERIC: case DISPLAYLIST_GENERIC:
break; break;
default: default:
@ -3876,6 +3871,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
case DISPLAYLIST_FILE_BROWSER_SELECT_DIR: case DISPLAYLIST_FILE_BROWSER_SELECT_DIR:
case DISPLAYLIST_FILE_BROWSER_SELECT_FILE: case DISPLAYLIST_FILE_BROWSER_SELECT_FILE:
case DISPLAYLIST_FILE_BROWSER_SELECT_CORE: case DISPLAYLIST_FILE_BROWSER_SELECT_CORE:
case DISPLAYLIST_FILE_BROWSER_SELECT_COLLECTION:
case DISPLAYLIST_GENERIC: case DISPLAYLIST_GENERIC:
{ {
menu_ctx_list_t list_info; menu_ctx_list_t list_info;

1
menu/menu_displaylist.h
View File

@ -67,6 +67,7 @@ enum menu_displaylist_ctl_state
DISPLAYLIST_FILE_BROWSER_SELECT_DIR, DISPLAYLIST_FILE_BROWSER_SELECT_DIR,
DISPLAYLIST_FILE_BROWSER_SELECT_FILE, DISPLAYLIST_FILE_BROWSER_SELECT_FILE,
DISPLAYLIST_FILE_BROWSER_SELECT_CORE, DISPLAYLIST_FILE_BROWSER_SELECT_CORE,
DISPLAYLIST_FILE_BROWSER_SELECT_COLLECTION,
DISPLAYLIST_CORES, DISPLAYLIST_CORES,
DISPLAYLIST_CORES_SUPPORTED, DISPLAYLIST_CORES_SUPPORTED,
DISPLAYLIST_CORES_COLLECTION_SUPPORTED, DISPLAYLIST_CORES_COLLECTION_SUPPORTED,