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

Music history list now usable for non-HAVE_FFMPEG builds

Browse Source
This commit is contained in:
twinaphex 2017-05-28 00:09:08 +02:00
parent 9fe1b9f0b2
commit f1447ddf3f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/cbs/menu_cbs_ok.c
View File

@ -3078,9 +3078,9 @@ static int action_ok_delete_entry(const char *path,
if (string_is_equal(playlist->conf_path, g_defaults.content_history->conf_path)) if (string_is_equal(playlist->conf_path, g_defaults.content_history->conf_path))
playlist = g_defaults.content_history; playlist = g_defaults.content_history;
#ifdef HAVE_FFMPEG
else if (string_is_equal(playlist->conf_path, g_defaults.music_history->conf_path)) else if (string_is_equal(playlist->conf_path, g_defaults.music_history->conf_path))
playlist = g_defaults.music_history; playlist = g_defaults.music_history;
#ifdef HAVE_FFMPEG
else if (string_is_equal(playlist->conf_path, g_defaults.video_history->conf_path)) else if (string_is_equal(playlist->conf_path, g_defaults.video_history->conf_path))
playlist = g_defaults.video_history; playlist = g_defaults.video_history;
#endif #endif

4
menu/menu_displaylist.c
View File

@ -4349,7 +4349,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
} }
break; break;
case DISPLAYLIST_MUSIC_HISTORY: case DISPLAYLIST_MUSIC_HISTORY:
#ifdef HAVE_FFMPEG
if (settings->bools.history_list_enable) if (settings->bools.history_list_enable)
menu_displaylist_parse_playlist_history(menu, info, menu_displaylist_parse_playlist_history(menu, info,
g_defaults.music_history, g_defaults.music_history,
@ -4371,7 +4370,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
info->need_refresh = true; info->need_refresh = true;
info->need_push = true; info->need_push = true;
} }
#endif
break; break;
case DISPLAYLIST_VIDEO_HISTORY: case DISPLAYLIST_VIDEO_HISTORY:
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
@ -5057,10 +5055,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
MENU_ENUM_LABEL_XMB_SHOW_IMAGES, MENU_ENUM_LABEL_XMB_SHOW_IMAGES,
PARSE_ONLY_BOOL, false); PARSE_ONLY_BOOL, false);
#endif #endif
#ifdef HAVE_FFMPEG
menu_displaylist_parse_settings_enum(menu, info, menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_XMB_SHOW_MUSIC, MENU_ENUM_LABEL_XMB_SHOW_MUSIC,
PARSE_ONLY_BOOL, false); PARSE_ONLY_BOOL, false);
#ifdef HAVE_FFMPEG
menu_displaylist_parse_settings_enum(menu, info, menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_XMB_SHOW_VIDEO, MENU_ENUM_LABEL_XMB_SHOW_VIDEO,
PARSE_ONLY_BOOL, false); PARSE_ONLY_BOOL, false);