From 1ec036fb91759071eccf3e0b71aa82f0a93b61bf Mon Sep 17 00:00:00 2001 From: zoltanvb <101990835+zoltanvb@users.noreply.github.com> Date: Sat, 11 Feb 2023 00:47:03 +0100 Subject: [PATCH] Music files should also obey builtin_mediaplayer_enable (#14967) Disabling the built in media player should be possible for music files as well. Without this, sound files can not be opened from file browser with cores that support them. --- menu/menu_displaylist.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 3ee8796df2..b65cdf97f8 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -390,13 +390,17 @@ static void filebrowser_parse( if (filebrowser_type == FILEBROWSER_SELECT_COLLECTION) file_type = FILE_TYPE_PLAYLIST_COLLECTION; - if (path_type == RARCH_CONTENT_MUSIC) - file_type = FILE_TYPE_MUSIC; - else if (builtin_mediaplayer_enable || + if (builtin_mediaplayer_enable || builtin_imageviewer_enable) { switch (path_type) { + case RARCH_CONTENT_MUSIC: +#if defined(HAVE_FFMPEG) || defined(HAVE_MPV) + if (builtin_mediaplayer_enable) + file_type = FILE_TYPE_MUSIC; +#endif + break; case RARCH_CONTENT_MOVIE: #if defined(HAVE_FFMPEG) || defined(HAVE_MPV) if (builtin_mediaplayer_enable)