ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

have show parent dir (for dirs and files) and filter extension (for files) options visible all the time

This commit is contained in:
Brad Parker 2016-09-25 21:47:12 -04:00
parent 95406cb1c6
commit 6826ec7748
1 changed files with 111 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
menu/menu_displaylist.c
View File

@ -3417,17 +3417,11 @@ static int menu_displaylist_parse_generic(
if (list_size == 0) if (list_size == 0)
{ {
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ITEMS),
msg_hash_to_str(MENU_ENUM_LABEL_NO_ITEMS),
MENU_ENUM_LABEL_NO_ITEMS,
MENU_SETTING_NO_ITEM, 0, 0);
string_list_free(str_list); string_list_free(str_list);
str_list = NULL;
return 0;
} }
else
{
for (i = 0; i < list_size; i++) for (i = 0; i < list_size; i++)
{ {
bool is_dir; bool is_dir;
@ -3495,25 +3489,25 @@ static int menu_displaylist_parse_generic(
switch (path_is_media_type(path)) switch (path_is_media_type(path))
{ {
case RARCH_CONTENT_MOVIE: case RARCH_CONTENT_MOVIE:
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
if (settings->multimedia.builtin_mediaplayer_enable) if (settings->multimedia.builtin_mediaplayer_enable)
file_type = FILE_TYPE_MOVIE; file_type = FILE_TYPE_MOVIE;
#endif #endif
break; break;
case RARCH_CONTENT_MUSIC: case RARCH_CONTENT_MUSIC:
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
if (settings->multimedia.builtin_mediaplayer_enable) if (settings->multimedia.builtin_mediaplayer_enable)
file_type = FILE_TYPE_MUSIC; file_type = FILE_TYPE_MUSIC;
#endif #endif
break; break;
case RARCH_CONTENT_IMAGE: case RARCH_CONTENT_IMAGE:
#ifdef HAVE_IMAGEVIEWER #ifdef HAVE_IMAGEVIEWER
if (settings->multimedia.builtin_imageviewer_enable if (settings->multimedia.builtin_imageviewer_enable
&& type != DISPLAYLIST_IMAGES) && type != DISPLAYLIST_IMAGES)
file_type = FILE_TYPE_IMAGEVIEWER; file_type = FILE_TYPE_IMAGEVIEWER;
else else
file_type = FILE_TYPE_IMAGE; file_type = FILE_TYPE_IMAGE;
#endif #endif
break; break;
default: default:
break; break;
@ -3523,9 +3517,9 @@ static int menu_displaylist_parse_generic(
switch (file_type) switch (file_type)
{ {
case FILE_TYPE_PLAIN: case FILE_TYPE_PLAIN:
#if 0 #if 0
enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_PLAIN_FILE; enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_PLAIN_FILE;
#endif #endif
break; break;
case FILE_TYPE_MOVIE: case FILE_TYPE_MOVIE:
enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_MOVIE_OPEN; enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_MOVIE_OPEN;
@ -3551,7 +3545,9 @@ static int menu_displaylist_parse_generic(
enum_idx, enum_idx,
file_type, 0, 0); file_type, 0, 0);
} }
}
if (str_list && str_list->size > 0)
string_list_free(str_list); string_list_free(str_list);
if (items_found == 0) if (items_found == 0)
@ -3561,8 +3557,6 @@ static int menu_displaylist_parse_generic(
msg_hash_to_str(MENU_ENUM_LABEL_NO_ITEMS), msg_hash_to_str(MENU_ENUM_LABEL_NO_ITEMS),
MENU_ENUM_LABEL_NO_ITEMS, MENU_ENUM_LABEL_NO_ITEMS,
MENU_SETTING_NO_ITEM, 0, 0); MENU_SETTING_NO_ITEM, 0, 0);
goto end;
} }
/* We don't want to show 'filter by extension' for this. */ /* We don't want to show 'filter by extension' for this. */