libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 00:20:01 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-09-01 07:31:08 +02:00
parent eb1ab2e429
commit 0cdb710f80
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
menu/drivers/materialui.c
View File

@ -51,6 +51,7 @@
#include "../../verbosity.h"
#include "../../tasks/tasks_internal.h"
#include "../../runtime_file.h"
#include "../../file_path_special.h"
#include "../../list_special.h"
/* Defines the 'device independent pixel' base
@ -2192,7 +2193,7 @@ static void materialui_refresh_playlist_icon_list(materialui_handle_t *mui)
/* Playlist is valid - generate image file name */
strlcpy(image_file, playlist_file, sizeof(image_file));
path_remove_extension(image_file);
strlcat(image_file, ".png", sizeof(image_file));
strlcat(image_file, FILE_PATH_PNG_EXTENSION, sizeof(image_file));
if (string_is_empty(image_file))
continue;
@ -3316,7 +3317,7 @@ static bool materialui_render_process_entry_playlist_desktop(
/* Get core name */
if (string_is_empty(entry->core_name) ||
string_is_equal(entry->core_name, "DETECT"))
string_is_equal(entry->core_name, FILE_PATH_DETECT))
core_name = msg_hash_to_str(MSG_AUTODETECT);
else
core_name = entry->core_name;

18
menu/drivers/xmb.c
View File

@ -51,6 +51,7 @@
#include "../../input/input_osk.h"
#include "../../file_path_special.h"
#include "../../verbosity.h"
#include "../../configuration.h"
@ -1097,7 +1098,7 @@ static void xmb_update_savestate_thumbnail_path(void *data, unsigned i)
strlcpy(path, global->name.savestate, sizeof(path));
}
strlcat(path, ".png", sizeof(path));
strlcat(path, FILE_PATH_PNG_EXTENSION, sizeof(path));
if (path_is_valid(path))
strlcpy(
@ -1814,7 +1815,7 @@ static void xmb_list_switch_new(xmb_handle_t *xmb,
free(tmp);
}
strlcat(path, ".png", sizeof(path));
strlcat(path, FILE_PATH_PNG_EXTENSION, sizeof(path));
if (!path_is_valid(path))
fill_pathname_application_special(path, sizeof(path),
@ -2211,13 +2212,13 @@ static void xmb_context_reset_horizontal_list(
APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_ICONS);
fill_pathname_join_concat(texturepath, iconpath, sysname,
".png", sizeof(texturepath));
FILE_PATH_PNG_EXTENSION, sizeof(texturepath));
/* If the playlist icon doesn't exist return default */
if (!path_is_valid(texturepath))
fill_pathname_join_concat(texturepath, iconpath, "default",
".png", sizeof(texturepath));
FILE_PATH_PNG_EXTENSION, sizeof(texturepath));
ti.width = 0;
ti.height = 0;
@ -2236,7 +2237,8 @@ static void xmb_context_reset_horizontal_list(
image_texture_free(&ti);
}
fill_pathname_join_delim(sysname, sysname, "content.png", '-',
fill_pathname_join_delim(sysname, sysname,
FILE_PATH_CONTENT_BASENAME, '-',
sizeof(sysname));
strlcat(content_texturepath, iconpath, sizeof(content_texturepath));
strlcat(content_texturepath, sysname, sizeof(content_texturepath));
@ -2247,7 +2249,7 @@ static void xmb_context_reset_horizontal_list(
{
strlcat(iconpath, "default", sizeof(iconpath));
fill_pathname_join_delim(content_texturepath, iconpath,
"content.png", '-', sizeof(content_texturepath));
FILE_PATH_CONTENT_BASENAME, '-', sizeof(content_texturepath));
}
if (image_texture_load(&ti, content_texturepath))
@ -5989,7 +5991,8 @@ static void xmb_context_reset_background(const char *iconpath)
char path[PATH_MAX_LENGTH];
path[0] = '\0';
fill_pathname_join(path, iconpath, "bg.png", sizeof(path));
fill_pathname_join(path, iconpath,
FILE_PATH_BACKGROUND_IMAGE, sizeof(path));
if (path_is_valid(path))
task_push_image_load(path,
video_driver_supports_rgba(), 0,
@ -5998,7 +6001,6 @@ static void xmb_context_reset_background(const char *iconpath)
#ifdef ORBIS
/* To avoid weird behaviour on orbis with remote host */
RARCH_LOG("[XMB] after task\n");
sleep(5);
#endif
}