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

(Lakka) Lakka now uses assets directory instead of hardcoded

Browse Source 
/usr/share/retroarch
This commit is contained in:
twinaphex 2014-05-10 05:25:50 +02:00
parent ac2ddc3b20
commit bbce01a449
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
file_path.c
View File

@ -569,7 +569,7 @@ static char *find_last_slash(const char *str)
// Assumes path is a directory. Appends a slash // Assumes path is a directory. Appends a slash
// if not already there. // if not already there.
static void fill_pathname_slash(char *path, size_t size) void fill_pathname_slash(char *path, size_t size)
{ {
size_t path_len = strlen(path); size_t path_len = strlen(path);
const char *last_slash = find_last_slash(path); const char *last_slash = find_last_slash(path);

1
file_path.h
View File

@ -139,6 +139,7 @@ void fill_pathname_join(char *out_path, const char *dir, const char *path, size_
void fill_pathname_expand_special(char *out_path, const char *in_path, size_t size); void fill_pathname_expand_special(char *out_path, const char *in_path, size_t size);
void fill_pathname_abbreviate_special(char *out_path, const char *in_path, size_t size); void fill_pathname_abbreviate_special(char *out_path, const char *in_path, size_t size);
void fill_pathname_slash(char *path, size_t size);
#ifndef RARCH_CONSOLE #ifndef RARCH_CONSOLE
void fill_pathname_application_path(char *buf, size_t size); void fill_pathname_application_path(char *buf, size_t size);

37
frontend/menu/disp/lakka.c
View File

@ -754,19 +754,31 @@ void lakka_render(void *data)
static void lakka_init_assets(void *data) static void lakka_init_assets(void *data)
{ {
char path[256], dirpath[256];;
rgui_handle_t *rgui = (rgui_handle_t*)data; rgui_handle_t *rgui = (rgui_handle_t*)data;
if (!rgui) if (!rgui)
return; return;
settings_icon = png_texture_load("/usr/share/retroarch/settings.png", &dim, &dim); fill_pathname_join(dirpath, g_settings.assets_directory, "lakka", sizeof(dirpath));
arrow_icon = png_texture_load("/usr/share/retroarch/arrow.png", &dim, &dim); fill_pathname_slash(dirpath, sizeof(dirpath));
run_icon = png_texture_load("/usr/share/retroarch/run.png", &dim, &dim);
resume_icon = png_texture_load("/usr/share/retroarch/resume.png", &dim, &dim); fill_pathname_join(path, dirpath, "settings.png", sizeof(path));
savestate_icon = png_texture_load("/usr/share/retroarch/savestate.png", &dim, &dim); settings_icon = png_texture_load(path, &dim, &dim);
loadstate_icon = png_texture_load("/usr/share/retroarch/loadstate.png", &dim, &dim); fill_pathname_join(path, dirpath, "arrow.png", sizeof(path));
screenshot_icon = png_texture_load("/usr/share/retroarch/screenshot.png", &dim, &dim); arrow_icon = png_texture_load(path, &dim, &dim);
reload_icon = png_texture_load("/usr/share/retroarch/reload.png", &dim, &dim); fill_pathname_join(path, dirpath, "run.png", sizeof(path));
run_icon = png_texture_load(path, &dim, &dim);
fill_pathname_join(path, dirpath, "resume.png", sizeof(path));
resume_icon = png_texture_load(path, &dim, &dim);
fill_pathname_join(path, dirpath, "savestate.png", sizeof(path));
savestate_icon = png_texture_load(path, &dim, &dim);
fill_pathname_join(path, dirpath, "loadstate.png", sizeof(path));
loadstate_icon = png_texture_load(path, &dim, &dim);
fill_pathname_join(path, dirpath, "screenshot.png", sizeof(path));
screenshot_icon = png_texture_load(path, &dim, &dim);
fill_pathname_join(path, dirpath, "reload.png", sizeof(path));
reload_icon = png_texture_load(path, &dim, &dim);
font_driver->render_msg(font, "Run", &run_label); font_driver->render_msg(font, "Run", &run_label);
font_driver->render_msg(font, "Resume", &resume_label); font_driver->render_msg(font, "Resume", &resume_label);
@ -954,7 +966,10 @@ static void *lakka_init(void)
for (i = 0; i < num_categories-1; i++) for (i = 0; i < num_categories-1; i++)
{ {
char core_id[256], texturepath[256], gametexturepath[256]; char core_id[256], texturepath[256], gametexturepath[256], dirpath[256];
fill_pathname_join(dirpath, g_settings.assets_directory, "lakka", sizeof(dirpath));
fill_pathname_slash(dirpath, sizeof(dirpath));
struct font_output_list out; struct font_output_list out;
core_info_t corenfo = rgui->core_info->list[i]; core_info_t corenfo = rgui->core_info->list[i];
@ -967,11 +982,11 @@ static void *lakka_init(void)
strlcpy(core_id, str_replace(core_id, "libretro-", ""), sizeof(core_id)); strlcpy(core_id, str_replace(core_id, "libretro-", ""), sizeof(core_id));
strlcpy(core_id, str_replace(core_id, "libretro_", ""), sizeof(core_id)); strlcpy(core_id, str_replace(core_id, "libretro_", ""), sizeof(core_id));
strlcpy(texturepath, "/usr/share/retroarch/", sizeof(texturepath)); strlcpy(texturepath, dirpath, sizeof(texturepath));
strlcat(texturepath, core_id, sizeof(texturepath)); strlcat(texturepath, core_id, sizeof(texturepath));
strlcat(texturepath, ".png", sizeof(texturepath)); strlcat(texturepath, ".png", sizeof(texturepath));
strlcpy(gametexturepath, "/usr/share/retroarch/", sizeof(gametexturepath)); strlcpy(gametexturepath, dirpath, sizeof(gametexturepath));
strlcat(gametexturepath, core_id, sizeof(gametexturepath)); strlcat(gametexturepath, core_id, sizeof(gametexturepath));
strlcat(gametexturepath, "-game.png", sizeof(gametexturepath)); strlcat(gametexturepath, "-game.png", sizeof(gametexturepath));