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

Merge branch 'master' of https://github.com/libretro/RetroArch

Browse Source
This commit is contained in:
twinaphex 2018-11-15 21:51:55 +01:00
commit 90f6d34055
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libretro-db/Makefile
View File

@ -13,7 +13,10 @@ endif
LIBRETRO_COMMON_C = \ LIBRETRO_COMMON_C = \
$(LIBRETRO_COMM_DIR)/streams/file_stream.c \ $(LIBRETRO_COMM_DIR)/streams/file_stream.c \
$(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.c $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.c \
$(LIBRETRO_COMM_DIR)/encodings/encoding_utf.c \
$(LIBRETRO_COMM_DIR)/compat/compat_strl.c \
$(LIBRETRO_COMM_DIR)/compat/fopen_utf8.c
C_CONVERTER_C = \ C_CONVERTER_C = \
$(LIBRETRODB_DIR)/rmsgpack.c \ $(LIBRETRODB_DIR)/rmsgpack.c \
@ -25,9 +28,7 @@ C_CONVERTER_C = \
$(LIBRETRO_COMM_DIR)/hash/rhash.c \ $(LIBRETRO_COMM_DIR)/hash/rhash.c \
$(LIBRETRO_COMM_DIR)/compat/compat_fnmatch.c \ $(LIBRETRO_COMM_DIR)/compat/compat_fnmatch.c \
$(LIBRETRO_COMM_DIR)/string/stdstring.c \ $(LIBRETRO_COMM_DIR)/string/stdstring.c \
$(LIBRETRO_COMM_DIR)/encodings/encoding_utf.c \ $(LIBRETRO_COMMON_C)
$(LIBRETRO_COMMON_C) \
$(LIBRETRO_COMM_DIR)/compat/compat_strl.c
C_CONVERTER_OBJS := $(C_CONVERTER_C:.c=.o) C_CONVERTER_OBJS := $(C_CONVERTER_C:.c=.o)
@ -40,9 +41,7 @@ RARCHDB_TOOL_C = \
$(LIBRETRODB_DIR)/libretrodb.c \ $(LIBRETRODB_DIR)/libretrodb.c \
$(LIBRETRO_COMM_DIR)/compat/compat_fnmatch.c \ $(LIBRETRO_COMM_DIR)/compat/compat_fnmatch.c \
$(LIBRETRO_COMM_DIR)/string/stdstring.c \ $(LIBRETRO_COMM_DIR)/string/stdstring.c \
$(LIBRETRO_COMM_DIR)/encodings/encoding_utf.c \ $(LIBRETRO_COMMON_C)
$(LIBRETRO_COMMON_C) \
$(LIBRETRO_COMM_DIR)/compat/compat_strl.c
RARCHDB_TOOL_OBJS := $(RARCHDB_TOOL_C:.c=.o) RARCHDB_TOOL_OBJS := $(RARCHDB_TOOL_C:.c=.o)

18
menu/drivers/ozone.c
View File

@ -1618,20 +1618,24 @@ static void ozone_context_reset_horizontal_list(ozone_handle_t *ozone)
malloc(PATH_MAX_LENGTH * sizeof(char)); malloc(PATH_MAX_LENGTH * sizeof(char));
char *content_texturepath = (char*) char *content_texturepath = (char*)
malloc(PATH_MAX_LENGTH * sizeof(char)); malloc(PATH_MAX_LENGTH * sizeof(char));
char *icons_path = (char*)
malloc(PATH_MAX_LENGTH * sizeof(char));
strlcpy(icons_path, ozone->icons_path, PATH_MAX_LENGTH * sizeof(char));
sysname[0] = texturepath[0] = content_texturepath[0] = '\0'; sysname[0] = texturepath[0] = content_texturepath[0] = '\0';
fill_pathname_base_noext(sysname, path, fill_pathname_base_noext(sysname, path,
PATH_MAX_LENGTH * sizeof(char)); PATH_MAX_LENGTH * sizeof(char));
fill_pathname_join_concat(texturepath, ozone->icons_path, sysname, fill_pathname_join_concat(texturepath, icons_path, sysname,
file_path_str(FILE_PATH_PNG_EXTENSION), file_path_str(FILE_PATH_PNG_EXTENSION),
PATH_MAX_LENGTH * sizeof(char)); PATH_MAX_LENGTH * sizeof(char));
/* If the playlist icon doesn't exist return default */ /* If the playlist icon doesn't exist return default */
if (!filestream_exists(texturepath)) if (!filestream_exists(texturepath))
fill_pathname_join_concat(texturepath, ozone->icons_path, "default", fill_pathname_join_concat(texturepath, icons_path, "default",
file_path_str(FILE_PATH_PNG_EXTENSION), file_path_str(FILE_PATH_PNG_EXTENSION),
PATH_MAX_LENGTH * sizeof(char)); PATH_MAX_LENGTH * sizeof(char));
@ -1655,7 +1659,7 @@ static void ozone_context_reset_horizontal_list(ozone_handle_t *ozone)
fill_pathname_join_delim(sysname, sysname, fill_pathname_join_delim(sysname, sysname,
file_path_str(FILE_PATH_CONTENT_BASENAME), '-', file_path_str(FILE_PATH_CONTENT_BASENAME), '-',
PATH_MAX_LENGTH * sizeof(char)); PATH_MAX_LENGTH * sizeof(char));
strlcat(content_texturepath, ozone->icons_path, PATH_MAX_LENGTH * sizeof(char)); strlcat(content_texturepath, icons_path, PATH_MAX_LENGTH * sizeof(char));
strlcat(content_texturepath, path_default_slash(), PATH_MAX_LENGTH * sizeof(char)); strlcat(content_texturepath, path_default_slash(), PATH_MAX_LENGTH * sizeof(char));
strlcat(content_texturepath, sysname, PATH_MAX_LENGTH * sizeof(char)); strlcat(content_texturepath, sysname, PATH_MAX_LENGTH * sizeof(char));
@ -1663,8 +1667,9 @@ static void ozone_context_reset_horizontal_list(ozone_handle_t *ozone)
/* If the content icon doesn't exist return default-content */ /* If the content icon doesn't exist return default-content */
if (!filestream_exists(content_texturepath)) if (!filestream_exists(content_texturepath))
{ {
strlcat(ozone->icons_path, "default", PATH_MAX_LENGTH * sizeof(char)); strlcat(icons_path, path_default_slash(), PATH_MAX_LENGTH * sizeof(char));
fill_pathname_join_delim(content_texturepath, ozone->icons_path, strlcat(icons_path, "default", PATH_MAX_LENGTH * sizeof(char));
fill_pathname_join_delim(content_texturepath, icons_path,
file_path_str(FILE_PATH_CONTENT_BASENAME), '-', file_path_str(FILE_PATH_CONTENT_BASENAME), '-',
PATH_MAX_LENGTH * sizeof(char)); PATH_MAX_LENGTH * sizeof(char));
} }
@ -1718,6 +1723,7 @@ static void ozone_context_reset_horizontal_list(ozone_handle_t *ozone)
free(sysname); free(sysname);
free(texturepath); free(texturepath);
free(content_texturepath); free(content_texturepath);
free(icons_path);
} }
} }
} }
@ -3324,7 +3330,7 @@ border_iterate:
/* Console specific icons */ /* Console specific icons */
if (entry.type == FILE_TYPE_RPL_ENTRY && ozone->horizontal_list && ozone->categories_selection_ptr > ozone->system_tab_end) if (entry.type == FILE_TYPE_RPL_ENTRY && ozone->horizontal_list && ozone->categories_selection_ptr > ozone->system_tab_end)
{ {
ozone_node_t *sidebar_node = (ozone_node_t*) file_list_get_userdata_at_offset(ozone->horizontal_list, ozone->categories_selection_ptr - ozone->system_tab_end); ozone_node_t *sidebar_node = (ozone_node_t*) file_list_get_userdata_at_offset(ozone->horizontal_list, ozone->categories_selection_ptr - ozone->system_tab_end-1);
if (!sidebar_node || !sidebar_node->content_icon) if (!sidebar_node || !sidebar_node->content_icon)
texture = ozone->icons_textures[icon]; texture = ozone->icons_textures[icon];