diff --git a/.github/workflows/Linux-menu-media.yml b/.github/workflows/Linux-menu-media.yml index 2e6715eceb..fdb8feebaa 100644 --- a/.github/workflows/Linux-menu-media.yml +++ b/.github/workflows/Linux-menu-media.yml @@ -54,6 +54,14 @@ jobs: run: python3 samples/menu/rgui_media/run.py --c89 --driver xmb samples/menu/rgui_media/fixture.mp4 - name: Real Ozone file-browser playback controls run: python3 samples/menu/rgui_media/run.py --c89 --driver ozone samples/menu/rgui_media/fixture.mp4 + - name: External movies and internal image activation across all menus + run: | + ffmpeg -v error -y -f lavfi -i color=c=orange:size=32x32 -frames:v 1 -threads 1 samples/menu/rgui_media/fixture.png + for driver in rgui materialui xmb ozone; do + python3 samples/menu/rgui_media/run.py --c89 --external --driver "$driver" samples/menu/rgui_media/fixture.mp4 + python3 samples/menu/rgui_media/run.py --c89 --external --driver "$driver" samples/menu/rgui_media/fixture.png + python3 samples/menu/rgui_media/run.py --c89 --browser-image --driver "$driver" samples/menu/rgui_media/fixture.png + done - name: Generate WebM transport fixtures run: | ffmpeg -v error -y -f lavfi -i testsrc2=size=320x240:rate=30 -f lavfi -i sine=frequency=440:sample_rate=48000 -t 3 -c:v libvpx -deadline realtime -cpu-used 8 -g 30 -auto-alt-ref 0 -c:a libopus -shortest samples/menu/rgui_media/fixture-opus.webm diff --git a/.github/workflows/scripts/compile-matrix.sh b/.github/workflows/scripts/compile-matrix.sh index 41220418ed..510e4b01a5 100755 --- a/.github/workflows/scripts/compile-matrix.sh +++ b/.github/workflows/scripts/compile-matrix.sh @@ -1022,7 +1022,7 @@ check_gates "griffin: HAVE_RETROSMB + cloud sync" "$UIDEFS -DRARCH_INTERNAL -DH # griffin can carry. A static helper in one translation unit that # another one also defines (get32 in net_smb2.c and rvorbis.c) only # collides here, so this lane carries as much of griffin as a host can. -GRIFFIN_FULL="-DRARCH_INTERNAL -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_OZONE -DHAVE_MATERIALUI -DHAVE_GFX_WIDGETS -DHAVE_OVERLAY -DHAVE_CONFIGFILE -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_RUNAHEAD -DHAVE_REWIND -DHAVE_PATCH -DHAVE_XDELTA -DHAVE_CHEATS -DHAVE_SCREENSHOTS -DHAVE_TRANSLATE -DHAVE_LIBRETRODB -DHAVE_DYNAMIC -DHAVE_DYLIB -DHAVE_THREADS -DHAVE_AUDIOMIXER -DHAVE_DSP_FILTER -DHAVE_VIDEO_FILTER -DHAVE_RWAV -DHAVE_RFLAC -DHAVE_RVORBIS -DHAVE_RMP3 -DHAVE_RAC3 -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_RWEBP -DHAVE_RDDS -DHAVE_RZSTD -DHAVE_7ZIP -DHAVE_CHD -DHAVE_RCHD -DHAVE_IMAGEVIEWER -DHAVE_STB_FONT -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_NETWORK_CMD -DHAVE_NETPLAYDISCOVERY -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_UPDATE_CORE_INFO -DHAVE_CORE_INFO_CACHE -DHAVE_CLOUDSYNC -DHAVE_S3 -DHAVE_CRYPTO -DHAVE_KEYCHAIN -DHAVE_SSL -DHAVE_RETROSSL -DHAVE_SMBCLIENT -DHAVE_RETROSMB -DHAVE_NFSCLIENT -DHAVE_RETRONFS -DHAVE_LANGEXTRA -DHAVE_SHADERPIPELINE -DHAVE_GLSL -DHAVE_OPENGL -D_GNU_SOURCE" +GRIFFIN_FULL="-DRARCH_INTERNAL -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_OZONE -DHAVE_MATERIALUI -DHAVE_GFX_WIDGETS -DHAVE_OVERLAY -DHAVE_CONFIGFILE -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_RUNAHEAD -DHAVE_REWIND -DHAVE_PATCH -DHAVE_XDELTA -DHAVE_CHEATS -DHAVE_SCREENSHOTS -DHAVE_TRANSLATE -DHAVE_LIBRETRODB -DHAVE_DYNAMIC -DHAVE_DYLIB -DHAVE_THREADS -DHAVE_AUDIOMIXER -DHAVE_DSP_FILTER -DHAVE_VIDEO_FILTER -DHAVE_RWAV -DHAVE_RFLAC -DHAVE_RVORBIS -DHAVE_RMP3 -DHAVE_RAC3 -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_RWEBP -DHAVE_RDDS -DHAVE_RZSTD -DHAVE_7ZIP -DHAVE_CHD -DHAVE_RCHD -DHAVE_STB_FONT -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_NETWORK_CMD -DHAVE_NETPLAYDISCOVERY -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_UPDATE_CORE_INFO -DHAVE_CORE_INFO_CACHE -DHAVE_CLOUDSYNC -DHAVE_S3 -DHAVE_CRYPTO -DHAVE_KEYCHAIN -DHAVE_SSL -DHAVE_RETROSSL -DHAVE_SMBCLIENT -DHAVE_RETROSMB -DHAVE_NFSCLIENT -DHAVE_RETRONFS -DHAVE_LANGEXTRA -DHAVE_SHADERPIPELINE -DHAVE_GLSL -DHAVE_OPENGL -D_GNU_SOURCE" check_gates "griffin: full unity (every codec + network stack)" "$UIDEFS $GRIFFIN_FULL" griffin/griffin.c # The SMB show-settings row read a HAVE_MENU-only default under # HAVE_SMBCLIENT alone; with the built-in client on by default that diff --git a/Makefile.common b/Makefile.common index 38c46276b3..5fec4ea02a 100644 --- a/Makefile.common +++ b/Makefile.common @@ -529,7 +529,6 @@ OBJ += $(LIBRETRO_COMM_DIR)/formats/image_texture.o \ $(LIBRETRO_COMM_DIR)/formats/image/image_yuv_blit.o ifeq ($(HAVE_IMAGEVIEWER), 1) - DEFINES += -DHAVE_IMAGEVIEWER OBJ += cores/libretro-imageviewer/image_core.o endif diff --git a/Makefile.dingux b/Makefile.dingux index 4bf1cac1f2..e3026848bb 100644 --- a/Makefile.dingux +++ b/Makefile.dingux @@ -65,7 +65,7 @@ HAVE_GETOPT_LONG = 1 HAVE_GLSL = 1 HAVE_HID = 1 HAVE_RMODTRACKER = 1 -HAVE_IMAGEVIEWER = 1 +HAVE_IMAGEVIEWER = 0 HAVE_LANGEXTRA = 1 HAVE_LIBRETRODB = 1 HAVE_MENU = 1 diff --git a/Makefile.dos b/Makefile.dos index 71194128f9..abce38ed01 100644 --- a/Makefile.dos +++ b/Makefile.dos @@ -42,7 +42,7 @@ HAVE_RJPEG = 1 HAVE_RBMP = 1 HAVE_7ZIP = 1 HAVE_RZSTD = 1 -HAVE_IMAGEVIEWER = 1 +HAVE_IMAGEVIEWER = 0 HAVE_LIBRETRODB = 1 HAVE_DSP_FILTER = 1 HAVE_VIDEO_FILTER = 1 diff --git a/Makefile.dos.salamander b/Makefile.dos.salamander index bf06fa016e..4460212942 100644 --- a/Makefile.dos.salamander +++ b/Makefile.dos.salamander @@ -39,7 +39,7 @@ HAVE_RPNG = 1 HAVE_RJPEG = 1 HAVE_RBMP = 1 HAVE_7ZIP = 1 -HAVE_IMAGEVIEWER = 1 +HAVE_IMAGEVIEWER = 0 HAVE_LIBRETRODB = 0 HAVE_DSP_FILTER = 1 HAVE_VIDEO_FILTER = 1 diff --git a/Makefile.griffin b/Makefile.griffin index d6486ee8b4..f5bcf06db4 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -581,7 +581,7 @@ else ifneq (,$(findstring windows_msvc2010,$(platform))) PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS PLATCFLAGS += -D__i686__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS - PLATCFLAGS += -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA + PLATCFLAGS += -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_LANGEXTRA PLATCFLAGS += -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_OZONE PLATCFLAGS += -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES PLATCFLAGS += -DHAVE_UPDATE_CORE_INFO @@ -669,7 +669,7 @@ else ifneq (,$(findstring windows_msvc2012,$(platform))) LD = link.exe PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS - PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES + PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES PLATCFLAGS += -DHAVE_UPDATE_CORE_INFO PLATCFLAGS += -DWIN32 -DHAVE_CDROM LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib @@ -756,7 +756,7 @@ else ifneq (,$(findstring windows_msvc2013,$(platform))) LD = link.exe PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS - PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES + PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES PLATCFLAGS += -DHAVE_UPDATE_CORE_INFO PLATCFLAGS += -DWIN32 -DHAVE_CDROM LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib @@ -844,7 +844,7 @@ else ifneq (,$(findstring windows_msvc2015,$(platform))) PLATCFLAGS += -utf-8 PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS - PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES + PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES PLATCFLAGS += -DHAVE_UPDATE_CORE_INFO PLATCFLAGS += -DWIN32 -DHAVE_CDROM LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib @@ -944,7 +944,7 @@ else ifeq (qnx,$(platform)) LDFLAGS += -g endif - PLATCFLAGS += -DHAVE_SHADERPIPELINE -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_GL_SYNC -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SPIRV_CROSS -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES + PLATCFLAGS += -DHAVE_SHADERPIPELINE -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_GL_SYNC -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SPIRV_CROSS -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES PLATCFLAGS += -DHAVE_UPDATE_CORE_INFO PLATCFLAGS += -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_XCB -DHAVE_EGL -DHAVE_BB10 -DHAVE_GLSL -DHAVE_AL -DHAVE_BSV_MOVIE -DRARCH_MOBILE EXT_TARGET := $(TARGET_NAME) @@ -984,7 +984,7 @@ else ifneq (,$(findstring unix,$(platform))) HAVE_CHEATS := 1 HAVE_CORE_INFO_CACHE := 1 - PLATCFLAGS += -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_GL_SYNC -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SPIRV_CROSS -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES + PLATCFLAGS += -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_GL_SYNC -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SPIRV_CROSS -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES PLATCFLAGS += -DHAVE_UPDATE_CORE_INFO PLATCFLAGS += -DHAVE_VULKAN -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_X11 -DHAVE_XCB -DHAVE_UDEV -DHAVE_BSV_MOVIE -DHAVE_PULSE EXT_TARGET := $(TARGET_NAME) @@ -1081,10 +1081,6 @@ ifeq ($(HAVE_RTGA), 1) CFLAGS += -DHAVE_RTGA endif -ifeq ($(HAVE_IMAGEVIEWER), 1) - CFLAGS += -DHAVE_IMAGEVIEWER -endif - ifeq ($(HAVE_BSV_MOVIE), 1) CFLAGS += -DHAVE_BSV_MOVIE endif diff --git a/Makefile.msvc b/Makefile.msvc index e90d5b0e6e..6e8387d63b 100644 --- a/Makefile.msvc +++ b/Makefile.msvc @@ -62,7 +62,7 @@ HAVE_OVERLAY := 1 HAVE_LANGEXTRA := 1 HAVE_CHEEVOS := 1 HAVE_SHADERPIPELINE := 1 -HAVE_IMAGEVIEWER := 1 +HAVE_IMAGEVIEWER := 0 HAVE_BSV_MOVIE := 1 HAVE_CHEATS := 1 HAVE_CORE_INFO_CACHE := 1 diff --git a/Makefile.orbis b/Makefile.orbis index 1760087167..d180b644e1 100644 --- a/Makefile.orbis +++ b/Makefile.orbis @@ -44,7 +44,7 @@ else HAVE_FILTERS_BUILTIN := 1 HAVE_LANGEXTRA := 1 - HAVE_IMAGEVIEWER := 1 + HAVE_IMAGEVIEWER := 0 HAVE_RPNG := 1 HAVE_RWEBP := 1 HAVE_RDDS := 1 diff --git a/Makefile.retrofw b/Makefile.retrofw index 8ec350bc79..ca05bb0fbe 100644 --- a/Makefile.retrofw +++ b/Makefile.retrofw @@ -76,7 +76,7 @@ HAVE_GETOPT_LONG = 1 HAVE_GLSL = 0 HAVE_HID = 0 HAVE_RMODTRACKER = 1 -HAVE_IMAGEVIEWER = 1 +HAVE_IMAGEVIEWER = 0 HAVE_LANGEXTRA = 0 HAVE_LIBRETRODB = 1 HAVE_MENU = 1 diff --git a/Makefile.rg350 b/Makefile.rg350 index 9a6bec6d8a..87515c42ad 100644 --- a/Makefile.rg350 +++ b/Makefile.rg350 @@ -73,7 +73,7 @@ HAVE_GETOPT_LONG = 1 HAVE_GLSL = 0 HAVE_HID = 1 HAVE_RMODTRACKER = 1 -HAVE_IMAGEVIEWER = 1 +HAVE_IMAGEVIEWER = 0 HAVE_LANGEXTRA = 0 HAVE_LIBRETRODB = 1 HAVE_MENU = 1 diff --git a/Makefile.rg350_odbeta b/Makefile.rg350_odbeta index afa799ee04..6b977860d4 100644 --- a/Makefile.rg350_odbeta +++ b/Makefile.rg350_odbeta @@ -68,7 +68,7 @@ HAVE_GETOPT_LONG = 1 HAVE_GLSL = 0 HAVE_HID = 1 HAVE_RMODTRACKER = 1 -HAVE_IMAGEVIEWER = 1 +HAVE_IMAGEVIEWER = 0 HAVE_LANGEXTRA = 0 HAVE_LIBRETRODB = 1 HAVE_MENU = 1 diff --git a/Makefile.webos b/Makefile.webos index c9aa5b8629..e84a26a67a 100644 --- a/Makefile.webos +++ b/Makefile.webos @@ -93,7 +93,7 @@ HAVE_GLSLANG_SPIRV_TOOLS = 0 HAVE_GLSLANG_SPIRV_TOOLS_OPT = 0 HAVE_HID = 1 HAVE_RMODTRACKER = 1 -HAVE_IMAGEVIEWER = 1 +HAVE_IMAGEVIEWER = 0 HAVE_XKBCOMMON ?= 0 HAVE_LANGEXTRA = 1 HAVE_LIBRETRODB = 1 diff --git a/config.def.h b/config.def.h index 03d5e683b3..673f50b94b 100644 --- a/config.def.h +++ b/config.def.h @@ -991,7 +991,7 @@ #define DEFAULT_CONTENT_SHOW_HISTORY true #define DEFAULT_CONTENT_SHOW_FAVORITES true #define DEFAULT_CONTENT_SHOW_FAVORITES_FIRST false -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) #define DEFAULT_CONTENT_SHOW_IMAGES true #endif #define DEFAULT_CONTENT_SHOW_MUSIC false @@ -2290,7 +2290,7 @@ #define DEFAULT_BUILTIN_MEDIAPLAYER_ENABLE false #endif -#if defined(HAVE_IMAGEVIEWER) +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) #define DEFAULT_BUILTIN_IMAGEVIEWER_ENABLE true #else #define DEFAULT_BUILTIN_IMAGEVIEWER_ENABLE false diff --git a/defaults.h b/defaults.h index d3e79899f4..9a711e25d6 100644 --- a/defaults.h +++ b/defaults.h @@ -71,7 +71,7 @@ struct defaults #ifndef IS_SALAMANDER playlist_t *content_history; playlist_t *content_favorites; -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) playlist_t *image_history; #endif playlist_t *music_history; diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 9eb5efc5f6..839b9b08a5 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -333,7 +333,7 @@ static int general_push(menu_displaylist_info_t *info, #if defined(HAVE_FFMPEG) || defined(HAVE_MPV) || defined (HAVE_AUDIOMIXER) bool multimedia_builtin_mediaplayer_enable = settings->bools.multimedia_builtin_mediaplayer_enable; #endif -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) bool multimedia_builtin_imageviewer_enable = settings->bools.multimedia_builtin_imageviewer_enable; #endif if (!menu) @@ -536,15 +536,24 @@ static int general_push(menu_displaylist_info_t *info, } #endif -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) if (multimedia_builtin_imageviewer_enable && id != PUSH_ARCHIVE_OPEN) { - struct retro_system_info sysinfo = {0}; - libretro_imageviewer_retro_get_system_info(&sysinfo); - if (*sysinfo.valid_extensions) - { - string_ext_list_merge_dedup(ext_filter, &_len, ext_size, sysinfo.valid_extensions); - } +#ifdef HAVE_RPNG + string_ext_list_merge_dedup(ext_filter, &_len, ext_size, "png"); +#endif +#ifdef HAVE_RJPEG + string_ext_list_merge_dedup(ext_filter, &_len, ext_size, "jpg|jpeg"); +#endif +#ifdef HAVE_RBMP + string_ext_list_merge_dedup(ext_filter, &_len, ext_size, "bmp"); +#endif +#ifdef HAVE_RTGA + string_ext_list_merge_dedup(ext_filter, &_len, ext_size, "tga"); +#endif +#ifdef HAVE_RWEBP + string_ext_list_merge_dedup(ext_filter, &_len, ext_size, "webp"); +#endif } #endif diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 754853b4af..4e64a175d9 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -7055,7 +7055,7 @@ static int action_ok_delete_entry(const char *path, #if defined(HAVE_FFMPEG) || defined(HAVE_MPV) || defined(HAVE_WEBMPLAYER) char *def_conf_video_path = NULL; #endif -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) char *def_conf_img_path = NULL; #endif char *def_conf_fav_path = NULL; @@ -7072,7 +7072,7 @@ static int action_ok_delete_entry(const char *path, #if defined(HAVE_FFMPEG) || defined(HAVE_MPV) || defined(HAVE_WEBMPLAYER) def_conf_video_path = playlist_get_conf_path(g_defaults.video_history); #endif -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) def_conf_img_path = playlist_get_conf_path(g_defaults.image_history); #endif def_conf_fav_path = playlist_get_conf_path(g_defaults.content_favorites); @@ -7085,7 +7085,7 @@ static int action_ok_delete_entry(const char *path, else if (string_is_equal(conf_path, def_conf_video_path)) playlist = g_defaults.video_history; #endif -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) else if (string_is_equal(conf_path, def_conf_img_path)) playlist = g_defaults.image_history; #endif diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 76d55e9512..fae01776dc 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -11031,6 +11031,10 @@ static enum menu_action materialui_parse_menu_entry_action( && menu_media_controls_action(&mui->media, action, menu_driver_get_current_time())) return MENU_ACTION_NOOP; + if ((mui->flags & MUI_FLAG_IS_FILE_LIST) + && (mui->flags & MUI_FLAG_SHOW_FULLSCREEN_THUMBNAILS) + && action == MENU_ACTION_OK) + return MENU_ACTION_NOOP; /* Scan user inputs */ switch (action) diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c index c232e69e40..d6131fb356 100644 --- a/menu/drivers/ozone.c +++ b/menu/drivers/ozone.c @@ -172,7 +172,7 @@ enum OZONE_SYSTEM_TAB_SETTINGS, OZONE_SYSTEM_TAB_HISTORY, OZONE_SYSTEM_TAB_FAVORITES, -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) OZONE_SYSTEM_TAB_IMAGES, #endif OZONE_SYSTEM_TAB_MUSIC, @@ -235,7 +235,7 @@ enum OZONE_ENTRIES_ICONS_TEXTURE_SETTINGS, OZONE_ENTRIES_ICONS_TEXTURE_HISTORY, OZONE_ENTRIES_ICONS_TEXTURE_FAVORITES, -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) OZONE_ENTRIES_ICONS_TEXTURE_IMAGES, #endif OZONE_ENTRIES_ICONS_TEXTURE_MUSICS, @@ -2119,7 +2119,7 @@ static uintptr_t ozone_entries_icon_get_texture( case MENU_ENUM_LABEL_GOTO_FAVORITES: case MENU_ENUM_LABEL_DEFERRED_FAVORITES_LIST: return GFX_SURFACE_HANDLE(ozone->tab_textures[OZONE_TAB_TEXTURE_FAVORITES]); -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) case MENU_ENUM_LABEL_GOTO_IMAGES: case MENU_ENUM_LABEL_DEFERRED_IMAGES_LIST: return GFX_SURFACE_HANDLE(ozone->tab_textures[OZONE_TAB_TEXTURE_IMAGE]); @@ -2550,7 +2550,7 @@ static uintptr_t ozone_entries_icon_get_texture( else if (string_is_equal(ozone->title, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_TAB))) return icons_tex[OZONE_ENTRIES_ICONS_TEXTURE_MOVIE]; break; -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) case OZONE_SYSTEM_TAB_IMAGES: return icons_tex[OZONE_ENTRIES_ICONS_TEXTURE_IMAGE]; #endif @@ -2804,7 +2804,7 @@ static const char *ozone_entries_icon_texture_path(unsigned id) return "favorites.png"; case OZONE_ENTRIES_ICONS_TEXTURE_ADD_FAVORITE: return "add-favorite.png"; -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) case OZONE_ENTRIES_ICONS_TEXTURE_IMAGES: return "images.png"; #endif @@ -3548,7 +3548,7 @@ const enum msg_hash_enums ozone_system_tabs_label[OZONE_SYSTEM_TAB_LAST] = { MENU_ENUM_LABEL_SETTINGS_TAB, MENU_ENUM_LABEL_HISTORY_TAB, MENU_ENUM_LABEL_FAVORITES_TAB, -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) MENU_ENUM_LABEL_IMAGES_TAB, #endif MENU_ENUM_LABEL_MUSIC_TAB, @@ -3599,7 +3599,7 @@ OZONE_NOINLINE static void ozone_draw_sidebar( MENU_ENUM_LABEL_VALUE_SETTINGS_TAB, MENU_ENUM_LABEL_VALUE_HISTORY_TAB, MENU_ENUM_LABEL_VALUE_FAVORITES_TAB, -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) MENU_ENUM_LABEL_VALUE_IMAGES_TAB, #endif MENU_ENUM_LABEL_VALUE_MUSIC_TAB, @@ -3620,7 +3620,7 @@ OZONE_NOINLINE static void ozone_draw_sidebar( OZONE_TAB_TEXTURE_SETTINGS, OZONE_TAB_TEXTURE_HISTORY, OZONE_TAB_TEXTURE_FAVORITES, -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) OZONE_TAB_TEXTURE_IMAGE, #endif OZONE_TAB_TEXTURE_MUSIC, @@ -4380,7 +4380,7 @@ static bool ozone_is_playlist(ozone_handle_t *ozone, bool depth) #if defined(HAVE_FFMPEG) || defined(HAVE_MPV) case OZONE_SYSTEM_TAB_VIDEO: #endif -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) case OZONE_SYSTEM_TAB_IMAGES: #endif default: @@ -5080,7 +5080,7 @@ static void ozone_sidebar_goto(ozone_handle_t *ozone, size_t new_selection) MENU_ENUM_LABEL_SETTINGS_TAB, MENU_ENUM_LABEL_HISTORY_TAB, MENU_ENUM_LABEL_FAVORITES_TAB, -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) MENU_ENUM_LABEL_IMAGES_TAB, #endif MENU_ENUM_LABEL_MUSIC_TAB, @@ -5101,7 +5101,7 @@ static void ozone_sidebar_goto(ozone_handle_t *ozone, size_t new_selection) MENU_SETTINGS_TAB, MENU_HISTORY_TAB, MENU_FAVORITES_TAB, -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) MENU_IMAGES_TAB, #endif MENU_MUSIC_TAB, @@ -5608,7 +5608,7 @@ static void ozone_refresh_system_tabs_list(ozone_handle_t * ozone) ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_FAVORITES; } -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) if (settings->bools.menu_content_show_images && settings->bools.history_list_enable) ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_IMAGES; #endif @@ -6570,7 +6570,7 @@ border_iterate: texture = icons_tex[OZONE_ENTRIES_ICONS_TEXTURE_HISTORY]; else if (string_is_equal(e->rich_label, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FAVORITES_TAB))) texture = icons_tex[OZONE_ENTRIES_ICONS_TEXTURE_FAVORITES]; -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) else if (string_is_equal(e->rich_label, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_IMAGES_TAB))) texture = icons_tex[OZONE_TAB_TEXTURE_IMAGE]; #endif @@ -9127,7 +9127,7 @@ static enum menu_action ozone_parse_menu_entry_action( if ((ozone->flags & OZONE_FLAG_IS_FILE_LIST) && !(ozone->flags2 & OZONE_FLAG2_SHOW_FULLSCREEN_THUMBNAILS) && (action == MENU_ACTION_OK || action == MENU_ACTION_SELECT || action == MENU_ACTION_START) - && menu_media_open_selected_movie(menu_st, &ozone->thumbnails.left, &ozone->thumbnails.right)) + && menu_media_open_selected_file(menu_st, &ozone->thumbnails.left, &ozone->thumbnails.right)) { ozone->thumbnails.pending = OZONE_PENDING_THUMBNAIL_NONE; ozone->flags |= OZONE_FLAG_FULLSCREEN_THUMBNAILS_AVAILABLE; @@ -9139,6 +9139,10 @@ static enum menu_action ozone_parse_menu_entry_action( && menu_media_controls_action(&ozone->media, action, menu_driver_get_current_time())) return MENU_ACTION_NOOP; + if ((ozone->flags & OZONE_FLAG_IS_FILE_LIST) + && (ozone->flags2 & OZONE_FLAG2_SHOW_FULLSCREEN_THUMBNAILS) + && action == MENU_ACTION_OK) + return MENU_ACTION_NOOP; /* We have to override the thumbnail stream * delay when opening the thumbnail sidebar; @@ -9211,7 +9215,7 @@ static enum menu_action ozone_parse_menu_entry_action( strlcpy(playlist_path, playlist_get_conf_path(g_defaults.content_favorites), sizeof(playlist_path)); break; case MENU_ENUM_LABEL_IMAGES_TAB: -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) strlcpy(playlist_path, playlist_get_conf_path(g_defaults.image_history), sizeof(playlist_path)); #endif break; diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 8caac8ff6c..27d87a7c14 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -9431,6 +9431,28 @@ static enum menu_action rgui_parse_menu_entry_action( struct menu_state *menu_st = menu_state_get_ptr(); enum menu_action new_action = action; + if (!(rgui->flags & (RGUI_FLAG_IS_PLAYLIST | RGUI_FLAG_IS_EXPLORE_LIST + | RGUI_FLAG_IS_QUICK_MENU)) && menu_st->entries.list) + { + file_list_t *list = MENU_LIST_GET_SELECTION(menu_st->entries.list, 0); + if (list && menu_st->selection_ptr < list->size + && (list->list[menu_st->selection_ptr].type == FILE_TYPE_IMAGE + || list->list[menu_st->selection_ptr].type == FILE_TYPE_IMAGEVIEWER)) + { + bool fullscreen = (rgui->flags & RGUI_FLAG_SHOW_FULLSCREEN_THUMBNAIL) != 0; + if (action == MENU_ACTION_START || action == MENU_ACTION_SELECT + || (action == MENU_ACTION_OK && !fullscreen) + || (action == MENU_ACTION_CANCEL && fullscreen)) + { + rgui_toggle_fs_thumbnail(rgui, config_get_ptr()->bools.menu_rgui_inline_thumbnails); + rgui->flags |= RGUI_FLAG_FORCE_REDRAW; + return MENU_ACTION_NOOP; + } + if (fullscreen && action == MENU_ACTION_OK) + return MENU_ACTION_NOOP; + } + } + if (*rgui->media_requested_path) { bool fullscreen = (rgui->flags & RGUI_FLAG_SHOW_FULLSCREEN_THUMBNAIL) != 0; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 803999de66..e143ce7d65 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -136,7 +136,7 @@ enum XMB_TEXTURE_SETTINGS, XMB_TEXTURE_HISTORY, XMB_TEXTURE_FAVORITES, -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) XMB_TEXTURE_IMAGES, #endif XMB_TEXTURE_MUSICS, @@ -272,7 +272,7 @@ enum #if defined(HAVE_FFMPEG) || defined(HAVE_MPV) XMB_SYSTEM_TAB_VIDEO, #endif -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) XMB_SYSTEM_TAB_IMAGES, #endif #ifdef HAVE_NETWORKING @@ -368,7 +368,7 @@ typedef struct xmb_handle xmb_node_t **playlist_db_node_map; xmb_node_t main_menu_node; -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) xmb_node_t images_tab_node; #endif xmb_node_t music_tab_node; @@ -3246,7 +3246,7 @@ static xmb_node_t* xmb_get_node(xmb_handle_t *xmb, unsigned i) { case XMB_SYSTEM_TAB_SETTINGS: return &xmb->settings_tab_node; -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) case XMB_SYSTEM_TAB_IMAGES: return &xmb->images_tab_node; #endif @@ -3834,7 +3834,7 @@ static void xmb_refresh_system_tabs_list(xmb_handle_t *xmb) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_FAVORITES; } -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) if (settings->bools.menu_content_show_images && settings->bools.history_list_enable) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_IMAGES; #endif @@ -3997,7 +3997,7 @@ static void xmb_populate_entries(void *data, ( depth == 1 && ( (xmb_system_tab == XMB_SYSTEM_TAB_FAVORITES) || (xmb_system_tab == XMB_SYSTEM_TAB_HISTORY) -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) || (xmb_system_tab == XMB_SYSTEM_TAB_IMAGES) #endif || (xmb_system_tab == XMB_SYSTEM_TAB_MUSIC) @@ -4425,7 +4425,7 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb, return GFX_SURFACE_HANDLE(xmb->textures.list[XMB_TEXTURE_HISTORY]); case MENU_ENUM_LABEL_GOTO_FAVORITES: return GFX_SURFACE_HANDLE(xmb->textures.list[XMB_TEXTURE_FAVORITES]); -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) case MENU_ENUM_LABEL_GOTO_IMAGES: return GFX_SURFACE_HANDLE(xmb->textures.list[XMB_TEXTURE_IMAGES]); #endif @@ -4827,7 +4827,7 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb, } } break; -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) case XMB_SYSTEM_TAB_IMAGES: return GFX_SURFACE_HANDLE(xmb->textures.list[XMB_TEXTURE_IMAGE]); #endif @@ -5648,7 +5648,7 @@ XMB_NOINLINE static int xmb_draw_item( texture = GFX_SURFACE_HANDLE(xmb->textures.list[XMB_TEXTURE_HISTORY]); else if (string_is_equal(entry.rich_label, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FAVORITES_TAB))) texture = GFX_SURFACE_HANDLE(xmb->textures.list[XMB_TEXTURE_FAVORITES]); -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) else if (string_is_equal(entry.rich_label, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_IMAGES_TAB))) texture = GFX_SURFACE_HANDLE(xmb->textures.list[XMB_TEXTURE_IMAGES]); #endif @@ -6199,7 +6199,7 @@ static enum menu_action xmb_parse_menu_entry_action( if (xmb->is_file_list && !xmb->show_fullscreen_thumbnails && (action == MENU_ACTION_OK || action == MENU_ACTION_SELECT || action == MENU_ACTION_START) - && menu_media_open_selected_movie(menu_st, &xmb->thumbnails.left, &xmb->thumbnails.right)) + && menu_media_open_selected_file(menu_st, &xmb->thumbnails.left, &xmb->thumbnails.right)) { xmb->thumbnails.pending = XMB_PENDING_THUMBNAIL_NONE; xmb->fullscreen_thumbnails_available = true; @@ -6211,6 +6211,9 @@ static enum menu_action xmb_parse_menu_entry_action( && menu_media_controls_action(&xmb->media, action, menu_driver_get_current_time())) return MENU_ACTION_NOOP; + if (xmb->is_file_list && xmb->show_fullscreen_thumbnails + && action == MENU_ACTION_OK) + return MENU_ACTION_NOOP; /* Scan user inputs */ switch (action) @@ -6797,7 +6800,7 @@ static const char *xmb_texture_path(unsigned id) return "favorites.png"; case XMB_TEXTURE_ADD_FAVORITE: return "add-favorite.png"; -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) case XMB_TEXTURE_IMAGES: return "images.png"; #endif @@ -7099,7 +7102,7 @@ static void xmb_context_reset_textures( xmb->settings_tab_node.icon = xmb->textures.list[XMB_TEXTURE_SETTINGS]; xmb->history_tab_node.icon = xmb->textures.list[XMB_TEXTURE_HISTORY]; xmb->favorites_tab_node.icon = xmb->textures.list[XMB_TEXTURE_FAVORITES]; -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) xmb->images_tab_node.icon = xmb->textures.list[XMB_TEXTURE_IMAGES]; #endif xmb->music_tab_node.icon = xmb->textures.list[XMB_TEXTURE_MUSICS]; @@ -7123,7 +7126,7 @@ static void xmb_context_reset_textures( xmb->history_tab_node.zoom = xmb->categories_active_zoom; xmb->favorites_tab_node.alpha = xmb->categories_active_alpha; xmb->favorites_tab_node.zoom = xmb->categories_active_zoom; -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) xmb->images_tab_node.alpha = xmb->categories_active_alpha; xmb->images_tab_node.zoom = xmb->categories_active_zoom; #endif @@ -9884,7 +9887,7 @@ static void xmb_free_textures(xmb_handle_t *xmb) xmb->settings_tab_node.icon = NULL; xmb->history_tab_node.icon = NULL; xmb->favorites_tab_node.icon = NULL; -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) xmb->images_tab_node.icon = NULL; #endif xmb->music_tab_node.icon = NULL; @@ -10164,7 +10167,7 @@ static void xmb_list_cache(void *data, enum menu_list_type type, menu_stack->list[stack_size - 1].label = strdup(MENU_ENUM_LABEL_SETTINGS_TAB_STR); menu_stack->list[stack_size - 1].type = MENU_SETTINGS_TAB; break; -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) case XMB_SYSTEM_TAB_IMAGES: menu_stack->list[stack_size - 1].label = strdup(MENU_ENUM_LABEL_IMAGES_TAB_STR); menu_stack->list[stack_size - 1].type = MENU_IMAGES_TAB; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 6d092ac40c..4a526b6e25 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -725,7 +725,7 @@ static int filebrowser_parse( #endif break; case RARCH_CONTENT_IMAGE: -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) if (builtin_imageviewer_enable && type != DISPLAYLIST_IMAGES) file_type = FILE_TYPE_IMAGEVIEWER; else @@ -1635,13 +1635,13 @@ static unsigned menu_displaylist_parse_core_manager_list(file_list_t *list, count++; #endif -#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_FFMPEG) || defined(HAVE_MPV) || defined(HAVE_AUDIOMIXER) +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) || defined(HAVE_FFMPEG) || defined(HAVE_MPV) || defined(HAVE_AUDIOMIXER) { /* MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM requires 'settings', * so the scope only exists where one of the entries below * is built in. */ settings_t *settings = config_get_ptr(); -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_USE_BUILTIN_IMAGE_VIEWER, PARSE_ONLY_BOOL, false) == 0) @@ -5564,7 +5564,7 @@ static unsigned menu_displaylist_parse_playlists( } } -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) if (settings->bools.menu_content_show_images && g_defaults.image_history) if (menu_entries_append(info_list, playlist_get_conf_path(g_defaults.image_history), @@ -6130,7 +6130,7 @@ static unsigned menu_displaylist_parse_playlist_manager_list( MENU_SETTING_ACTION, 0, 0, NULL)) count++; -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) /* Add image history */ if (playlist_size(g_defaults.image_history) > 0) if (menu_entries_append(list, @@ -18030,7 +18030,7 @@ static bool menu_displaylist_ctl_internal( break; case DISPLAYLIST_IMAGES_HISTORY: menu_entries_clear(info->list); -#ifdef HAVE_IMAGEVIEWER +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) { bool history_list_enable = settings->bools.history_list_enable; const char *path_content_image_history = settings->paths.path_content_image_history; @@ -18064,7 +18064,7 @@ static bool menu_displaylist_ctl_internal( info->flags &= ~MD_FLAG_NEED_SORT; info->flags |= MD_FLAG_NEED_REFRESH | MD_FLAG_NEED_PUSH; -#if defined(HAVE_IMAGEVIEWER) +#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_MENU) if (history_needs_navigation_clear(menu, g_defaults.image_history)) info->flags |= MD_FLAG_NEED_NAVIGATION_CLEAR; #endif diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 65231e0d4f..47468fde84 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -31,6 +31,7 @@ #include