mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create HAVE_IMAGEVIEWER ifdef

Browse Source
This commit is contained in:
twinaphex 2015-06-28 18:55:00 +02:00
parent 8abf6779c0
commit 84c18a353d
10 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.common
View File

@ -194,8 +194,12 @@ OBJ += frontend/frontend.o \
performance.o
OBJ += gfx/image/image.o \
cores/image_core.o
OBJ += gfx/image/image.o
ifeq ($(HAVE_IMAGEVIEWER), 1)
DEFINES += -DHAVE_IMAGEVIEWER
OBJ += cores/image_core.o
endif
# Qt

4
dynamic.c
View File

@ -64,7 +64,9 @@ static dylib_t lib_handle;
#define SYM_FFMPEG(x) p##x = libretro_ffmpeg_##x
#endif
#ifdef HAVE_IMAGEVIEWER
#define SYM_IMAGEVIEWER(x) p##x = libretro_imageviewer_##x
#endif
void (*pretro_init)(void);
void (*pretro_deinit)(void);
@ -444,6 +446,7 @@ static void load_symbols(enum rarch_core_type type)
break;
#endif
case CORE_TYPE_IMAGEVIEWER:
#ifdef HAVE_IMAGEVIEWER
SYM_IMAGEVIEWER(retro_init);
SYM_IMAGEVIEWER(retro_deinit);
@ -477,6 +480,7 @@ static void load_symbols(enum rarch_core_type type)
SYM_IMAGEVIEWER(retro_get_region);
SYM_IMAGEVIEWER(retro_get_memory_data);
SYM_IMAGEVIEWER(retro_get_memory_size);
#endif
break;
}
}

3
griffin/griffin.c
View File

@ -176,7 +176,10 @@ VIDEO IMAGE
#include "../libretro-common/formats/tga/tga_decode.c"
#ifdef HAVE_IMAGEVIEWER
#include "../cores/image_core.c"
#endif
#ifdef HAVE_RPNG
#include "../libretro-common/formats/png/rpng_fbio.c"
#include "../libretro-common/formats/png/rpng_nbio.c"

4
menu/cbs/menu_cbs_deferred_push.c
View File

@ -455,6 +455,8 @@ static int deferred_push_detect_core_list(menu_displaylist_info_t *info)
strlcat(info->exts, "|", sizeof(info->exts));
strlcat(info->exts, sysinfo.valid_extensions, sizeof(info->exts));
}
#endif
#ifdef HAVE_IMAGEVIEWER
if (settings->multimedia.builtin_imageviewer_enable)
{
libretro_imageviewer_retro_get_system_info(&sysinfo);
@ -500,12 +502,14 @@ static int deferred_push_default(menu_displaylist_info_t *info)
strlcat(info->exts, sysinfo.valid_extensions, sizeof(info->exts));
}
#endif
#ifdef HAVE_IMAGEVIEWER
if (settings->multimedia.builtin_imageviewer_enable)
{
libretro_imageviewer_retro_get_system_info(&sysinfo);
strlcat(info->exts, "|", sizeof(info->exts));
strlcat(info->exts, sysinfo.valid_extensions, sizeof(info->exts));
}
#endif
}
return menu_displaylist_push_list(info, DISPLAYLIST_DEFAULT);

2
menu/menu.c
View File

@ -168,7 +168,9 @@ void menu_common_load_content(bool persist, enum rarch_core_type type)
break;
#endif
case CORE_TYPE_IMAGEVIEWER:
#ifdef HAVE_IMAGEVIEWER
event_command(EVENT_CMD_LOAD_CONTENT_IMAGEVIEWER);
#endif
break;
}

2
menu/menu_displaylist.c
View File

@ -1998,8 +1998,10 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool *n
#endif
break;
case RARCH_CONTENT_IMAGE:
#ifdef HAVE_IMAGEVIEWER
if (settings->multimedia.builtin_imageviewer_enable)
file_type = MENU_FILE_IMAGEVIEWER;
#endif
default:
break;
}

4
menu/menu_setting.c
View File

@ -4875,6 +4875,7 @@ static bool setting_append_list_multimedia_options(
general_read_handler);
#endif
#ifdef HAVE_IMAGEVIEWER
CONFIG_BOOL(
settings->multimedia.builtin_imageviewer_enable,
menu_hash_to_str(MENU_LABEL_USE_BUILTIN_IMAGE_VIEWER),
@ -4887,6 +4888,7 @@ static bool setting_append_list_multimedia_options(
parent_group,
general_write_handler,
general_read_handler);
#endif
END_SUB_GROUP(list, list_info, parent_group);
END_GROUP(list, list_info, parent_group);
@ -6198,11 +6200,13 @@ rarch_setting_t *menu_setting_new(unsigned mask)
goto error;
}
#if defined(HAVE_IMAGEVIEWER) || defined(HAVE_FFMPEG)
if (mask & SL_FLAG_MULTIMEDIA_OPTIONS)
{
if (!setting_append_list_multimedia_options(&list, list_info, root))
goto error;
}
#endif
if (mask & SL_FLAG_UI_OPTIONS)
{

2
qb/config.libs.sh
View File

@ -404,6 +404,6 @@ add_define_make OS "$OS"
# Creates config.mk and config.h.
add_define_make GLOBAL_CONFIG_DIR "$GLOBAL_CONFIG_DIR"
VARS="RGUI LAKKA GLUI XMB ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO CORETEXT PULSE SDL SDL2 D3D9 DINPUT LIBUSB XINPUT DSOUND XAUDIO OPENGL EXYNOS DISPMANX SUNXI OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA WAYLAND MALI_FBDEV VIVANTE_FBDEV NETWORKING NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 SWRESAMPLE FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT 7ZIP PARPORT COCOA AVFOUNDATION CORELOCATION IOHIDMANAGER LIBRETRODB"
VARS="RGUI LAKKA GLUI XMB ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO CORETEXT PULSE SDL SDL2 D3D9 DINPUT LIBUSB XINPUT DSOUND XAUDIO OPENGL EXYNOS DISPMANX SUNXI OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA WAYLAND MALI_FBDEV VIVANTE_FBDEV NETWORKING NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 SWRESAMPLE FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT 7ZIP PARPORT IMAGEVIEWER COCOA AVFOUNDATION CORELOCATION IOHIDMANAGER LIBRETRODB"
create_config_make config.mk $VARS
create_config_header config.h $VARS

1
qb/config.params.sh
View File

@ -54,3 +54,4 @@ HAVE_FLOATSOFTFP=no # Force soft float ABI (for ARM)
HAVE_7ZIP=yes # Compile in 7z support
HAVE_PRESERVE_DYLIB=no # Disable dlclose() for Valgrind support
HAVE_PARPORT=auto # Parallel port joypad support
HAVE_IMAGEVIEWER=yes # Built-in image viewer support.

4
retroarch.c
View File

@ -453,6 +453,7 @@ enum rarch_content_type rarch_path_is_media_type(const char *path)
case MENU_VALUE_FILE_WAV:
return RARCH_CONTENT_MUSIC;
#endif
#ifdef HAVE_IMAGEVIEWER
case MENU_VALUE_FILE_JPG:
case MENU_VALUE_FILE_JPG_CAPS:
case MENU_VALUE_FILE_JPEG:
@ -462,6 +463,7 @@ enum rarch_content_type rarch_path_is_media_type(const char *path)
case MENU_VALUE_FILE_TGA:
case MENU_VALUE_FILE_BMP:
return RARCH_CONTENT_IMAGE;
#endif
default:
break;
}
@ -1225,6 +1227,7 @@ int rarch_main_init(int argc, char *argv[])
#endif
}
break;
#ifdef HAVE_IMAGEVIEWER
case RARCH_CONTENT_IMAGE:
if (settings->multimedia.builtin_imageviewer_enable)
{
@ -1232,6 +1235,7 @@ int rarch_main_init(int argc, char *argv[])
global->core_type = CORE_TYPE_IMAGEVIEWER;
}
break;
#endif
default:
break;
}