libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-03 07:22:15 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

(XMB) Thumbnail type switching

Browse Source
This commit is contained in:
Jean-André Santoni 2016-04-08 01:42:53 +07:00
parent 53a1369dba
commit 7dfb3c373a
18 changed files with 146 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configuration.c
View File

@ -616,7 +616,7 @@ static void config_set_defaults(void)
settings->menu.timedate_enable = true;
settings->menu.core_enable = true;
settings->menu.dynamic_wallpaper_enable = false;
settings->menu.boxart_enable = false;
settings->menu.thumbnails = 0;
*settings->menu.wallpaper = '\0';
settings->menu.show_advanced_settings = show_advanced_settings;
settings->menu.entry_normal_color = menu_entry_normal_color;
@ -764,7 +764,7 @@ static void config_set_defaults(void)
*settings->core_assets_directory = '\0';
*settings->assets_directory = '\0';
*settings->dynamic_wallpapers_directory = '\0';
*settings->boxarts_directory = '\0';
*settings->thumbnails_directory = '\0';
*settings->playlist_directory = '\0';
*settings->video.shader_path = '\0';
*settings->video.shader_dir = '\0';
@ -1351,8 +1351,8 @@ static bool config_load_file(const char *path, bool set_defaults)
"menu_core_enable");
CONFIG_GET_BOOL_BASE(conf, settings, menu.dynamic_wallpaper_enable,
"menu_dynamic_wallpaper_enable");
CONFIG_GET_BOOL_BASE(conf, settings, menu.boxart_enable,
"menu_boxart_enable");
CONFIG_GET_INT_BASE(conf, settings, menu.thumbnails,
"thumbnails");
CONFIG_GET_BOOL_BASE(conf, settings, menu.navigation.wraparound.enable,
"menu_navigation_wraparound_enable");
CONFIG_GET_BOOL_BASE(conf, settings,
@ -1602,8 +1602,8 @@ static bool config_load_file(const char *path, bool set_defaults)
sizeof(settings->assets_directory));
config_get_path(conf, "dynamic_wallpapers_directory", settings->dynamic_wallpapers_directory,
sizeof(settings->dynamic_wallpapers_directory));
config_get_path(conf, "boxarts_directory", settings->boxarts_directory,
sizeof(settings->boxarts_directory));
config_get_path(conf, "thumbnails_directory", settings->thumbnails_directory,
sizeof(settings->thumbnails_directory));
config_get_path(conf, "playlist_directory", settings->playlist_directory,
sizeof(settings->playlist_directory));
if (string_is_equal(settings->core_assets_directory, "default"))
@ -1612,8 +1612,8 @@ static bool config_load_file(const char *path, bool set_defaults)
*settings->assets_directory = '\0';
if (string_is_equal(settings->dynamic_wallpapers_directory, "default"))
*settings->dynamic_wallpapers_directory = '\0';
if (string_is_equal(settings->boxarts_directory, "default"))
*settings->boxarts_directory = '\0';
if (string_is_equal(settings->thumbnails_directory, "default"))
*settings->thumbnails_directory = '\0';
if (string_is_equal(settings->playlist_directory, "default"))
*settings->playlist_directory = '\0';
#ifdef HAVE_MENU
@ -2658,7 +2658,7 @@ bool config_save_file(const char *path)
config_set_bool(conf,"menu_core_enable", settings->menu.core_enable);
config_set_bool(conf,"menu_dynamic_wallpaper_enable",
settings->menu.dynamic_wallpaper_enable);
config_set_bool(conf,"menu_boxart_enable", settings->menu.boxart_enable);
config_set_int(conf,"thumbnails", settings->menu.thumbnails);
config_set_path(conf, "menu_wallpaper", settings->menu.wallpaper);
#endif
config_set_bool(conf, "video_vsync", settings->video.vsync);
@ -2762,9 +2762,9 @@ bool config_save_file(const char *path)
config_set_path(conf, "dynamic_wallpapers_directory",
*settings->dynamic_wallpapers_directory ?
settings->dynamic_wallpapers_directory : "default");
config_set_path(conf, "boxarts_directory",
*settings->boxarts_directory ?
settings->boxarts_directory : "default");
config_set_path(conf, "thumbnails_directory",
*settings->thumbnails_directory ?
settings->thumbnails_directory : "default");
config_set_path(conf, "playlist_directory",
*settings->playlist_directory ?
settings->playlist_directory : "default");

4
configuration.h
View File

@ -123,7 +123,7 @@ typedef struct settings
bool timedate_enable;
bool core_enable;
bool dynamic_wallpaper_enable;
bool boxart_enable;
unsigned thumbnails;
bool throttle;
char wallpaper[PATH_MAX_LENGTH];
@ -371,7 +371,7 @@ typedef struct settings
char core_assets_directory[PATH_MAX_LENGTH];
char assets_directory[PATH_MAX_LENGTH];
char dynamic_wallpapers_directory[PATH_MAX_LENGTH];
char boxarts_directory[PATH_MAX_LENGTH];
char thumbnails_directory[PATH_MAX_LENGTH];
char menu_config_directory[PATH_MAX_LENGTH];
#if defined(HAVE_MENU)
char menu_content_directory[PATH_MAX_LENGTH];

37
menu/cbs/menu_cbs_get_value.c
View File

@ -615,6 +615,39 @@ static void menu_action_setting_disp_set_label_xmb_theme(
}
}
static void menu_action_setting_disp_set_label_thumbnails(
file_list_t* list,
unsigned *w, unsigned type, unsigned i,
const char *label,
char *s, size_t len,
const char *entry_label,
const char *path,
char *s2, size_t len2)
{
settings_t *settings = config_get_ptr();
if (!settings)
return;
strlcpy(s2, path, len2);
*w = 19;
switch (settings->menu.thumbnails)
{
case 0:
snprintf(s, len, "%s", "OFF");
break;
case 1:
snprintf(s, len, "%s", "Screenshots");
break;
case 2:
snprintf(s, len, "%s", "Title Screens");
break;
case 3:
snprintf(s, len, "%s", "Boxarts");
break;
}
}
static void menu_action_setting_disp_set_label_menu_toggle_gamepad_combo(
file_list_t* list,
unsigned *w, unsigned type, unsigned i,
@ -1173,6 +1206,10 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_xmb_theme);
break;
case MENU_LABEL_THUMBNAILS:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_thumbnails);
break;
case MENU_LABEL_INPUT_MENU_TOGGLE_GAMEPAD_COMBO:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_toggle_gamepad_combo);

2
menu/drivers/materialui.c
View File

@ -1176,7 +1176,7 @@ static bool mui_load_image(void *userdata, void *data, enum menu_image_type type
TEXTURE_FILTER_MIPMAP_LINEAR, &mui->textures.bg);
mui_allocate_white_texture(mui);
break;
case MENU_IMAGE_BOXART:
case MENU_IMAGE_THUMBNAIL:
break;
}

102
menu/drivers/xmb.c
View File

@ -142,11 +142,11 @@ typedef struct xmb_handle
char box_message[PATH_MAX_LENGTH];
float x;
float alpha;
uintptr_t boxart;
float boxart_width;
float boxart_height;
uintptr_t thumbnail;
float thumbnail_width;
float thumbnail_height;
char background_file_path[PATH_MAX_LENGTH];
char boxart_file_path[PATH_MAX_LENGTH];
char thumbnail_file_path[PATH_MAX_LENGTH];
struct
{
@ -245,6 +245,26 @@ static const char *xmb_theme_ident(void)
return "monochrome";
}
static const char *xmb_thumbnails_ident(void)
{
settings_t *settings = config_get_ptr();
switch (settings->menu.thumbnails)
{
case 0:
return "OFF";
case 1:
return "Named_Snaps";
case 2:
return "Named_Titles";
case 3:
return "Named_Boxarts";
default:
break;
}
return "OFF";
}
static void xmb_fill_default_background_path(xmb_handle_t *xmb,
char *path, size_t size)
{
@ -426,14 +446,14 @@ static void xmb_draw_icon(xmb_handle_t *xmb,
width, height, 1.0, rotation, scale_factor, color);
}
static void xmb_draw_boxart(xmb_handle_t *xmb, float *color,
static void xmb_draw_thumbnail(xmb_handle_t *xmb, float *color,
unsigned width, unsigned height)
{
menu_display_ctx_rotate_draw_t rotate_draw;
menu_display_ctx_draw_t draw;
struct gfx_coords coords;
math_matrix_4x4 mymat;
float y = xmb->margins.screen.top + xmb->icon.size + xmb->boxart_height;
float y = xmb->margins.screen.top + xmb->icon.size + xmb->thumbnail_height;
float x = xmb->margins.screen.left + xmb->icon.spacing.horizontal +
xmb->icon.spacing.horizontal*4 - xmb->icon.size / 4;
@ -454,11 +474,11 @@ static void xmb_draw_boxart(xmb_handle_t *xmb, float *color,
draw.x = x;
draw.y = height - y;
draw.width = xmb->boxart_width;
draw.height = xmb->boxart_height;
draw.width = xmb->thumbnail_width;
draw.height = xmb->thumbnail_height;
draw.coords = &coords;
draw.matrix_data = &mymat;
draw.texture = xmb->boxart;
draw.texture = xmb->thumbnail;
draw.prim_type = MENU_DISPLAY_PRIM_TRIANGLESTRIP;
menu_display_ctl(MENU_DISPLAY_CTL_DRAW, &draw);
@ -563,31 +583,31 @@ end:
string_list_free(list);
}
static void xmb_update_boxart_path(xmb_handle_t *xmb, unsigned i)
static void xmb_update_thumbnail_path(xmb_handle_t *xmb, unsigned i)
{
menu_entry_t entry;
settings_t *settings = config_get_ptr();
menu_entry_get(&entry, 0, i, NULL, true);
fill_pathname_join(xmb->boxart_file_path, settings->boxarts_directory,
xmb->title_name, sizeof(xmb->boxart_file_path));
fill_pathname_join(xmb->boxart_file_path, xmb->boxart_file_path,
"Named_Snaps", sizeof(xmb->boxart_file_path));
fill_pathname_join(xmb->boxart_file_path, xmb->boxart_file_path,
entry.path, sizeof(xmb->boxart_file_path));
fill_pathname_join(xmb->thumbnail_file_path, settings->thumbnails_directory,
xmb->title_name, sizeof(xmb->thumbnail_file_path));
fill_pathname_join(xmb->thumbnail_file_path, xmb->thumbnail_file_path,
xmb_thumbnails_ident(), sizeof(xmb->thumbnail_file_path));
fill_pathname_join(xmb->thumbnail_file_path, xmb->thumbnail_file_path,
entry.path, sizeof(xmb->thumbnail_file_path));
strlcat(xmb->boxart_file_path, ".png", sizeof(xmb->boxart_file_path));
strlcat(xmb->thumbnail_file_path, ".png", sizeof(xmb->thumbnail_file_path));
}
static void menu_display_handle_boxart_upload(void *task_data,
static void menu_display_handle_thumbnail_upload(void *task_data,
void *user_data, const char *err)
{
menu_ctx_load_image_t load_image_info;
struct texture_image *img = (struct texture_image*)task_data;
load_image_info.data = img;
load_image_info.type = MENU_IMAGE_BOXART;
load_image_info.type = MENU_IMAGE_THUMBNAIL;
menu_driver_ctl(RARCH_MENU_CTL_LOAD_IMAGE, &load_image_info);
@ -595,13 +615,13 @@ static void menu_display_handle_boxart_upload(void *task_data,
free(img);
}
static void xmb_update_boxart_image(xmb_handle_t *xmb)
static void xmb_update_thumbnail_image(xmb_handle_t *xmb)
{
if (path_file_exists(xmb->boxart_file_path))
rarch_task_push_image_load(xmb->boxart_file_path, "cb_menu_boxart",
menu_display_handle_boxart_upload, NULL);
if (path_file_exists(xmb->thumbnail_file_path))
rarch_task_push_image_load(xmb->thumbnail_file_path, "cb_menu_thumbnail",
menu_display_handle_thumbnail_upload, NULL);
else if (xmb->depth == 1)
xmb->boxart = 0;
xmb->thumbnail = 0;
}
static void xmb_selection_pointer_changed(
@ -654,10 +674,10 @@ static void xmb_selection_pointer_changed(
iz = XMB_ITEM_ACTIVE_ZOOM;
depth = xmb_list_get_size(xmb, MENU_LIST_PLAIN);
if (settings->menu.boxart_enable && depth == 1)
if (strcmp(xmb_thumbnails_ident(), "OFF") && depth == 1)
{
xmb_update_boxart_path(xmb, i);
xmb_update_boxart_image(xmb);
xmb_update_thumbnail_path(xmb, i);
xmb_update_thumbnail_image(xmb);
}
}
@ -1092,10 +1112,10 @@ static void xmb_list_switch(xmb_handle_t *xmb)
xmb_list_switch_new(xmb, selection_buf, dir, selection);
xmb->categories.active.idx_old = xmb->categories.selection_ptr;
if (settings->menu.boxart_enable)
if (strcmp(xmb_thumbnails_ident(), "OFF"))
{
xmb_update_boxart_path(xmb, 0);
xmb_update_boxart_image(xmb);
xmb_update_thumbnail_path(xmb, 0);
xmb_update_thumbnail_image(xmb);
}
}
@ -1393,8 +1413,8 @@ static void xmb_populate_entries(void *data,
{
xmb_selection_pointer_changed(xmb, false);
menu_driver_ctl(RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, NULL);
if (settings->menu.boxart_enable)
xmb_update_boxart_image(xmb);
if (strcmp(xmb_thumbnails_ident(), "OFF"))
xmb_update_thumbnail_image(xmb);
return;
}
@ -1654,7 +1674,7 @@ static void xmb_draw_items(xmb_handle_t *xmb,
ticker_limit = 35;
if (string_is_empty(entry.value))
{
if (settings->menu.boxart_enable && xmb->boxart)
if (strcmp(xmb_thumbnails_ident(), "OFF") && xmb->thumbnail)
ticker_limit = 40;
else
ticker_limit = 70;
@ -1975,8 +1995,8 @@ static void xmb_frame(void *data)
menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL);
if (settings->menu.boxart_enable && xmb->boxart)
xmb_draw_boxart(xmb, &coord_color2[0], width, height);
if (strcmp(xmb_thumbnails_ident(), "OFF") && xmb->thumbnail)
xmb_draw_thumbnail(xmb, &coord_color2[0], width, height);
/* set alpha components of colors */
coord_color2[3] = coord_color2[7] = coord_color2[11] =
@ -2127,7 +2147,7 @@ static void xmb_layout(xmb_handle_t *xmb)
new_header_height = 128.0 * scale_factor;
xmb->margins.screen.top = (256+32) * scale_factor;
xmb->boxart_width = 460.0 * scale_factor;
xmb->thumbnail_width = 460.0 * scale_factor;
xmb->cursor.size = 64.0;
xmb->icon.spacing.horizontal = 200.0 * scale_factor;
@ -2318,13 +2338,13 @@ static bool xmb_load_image(void *userdata, void *data, enum menu_image_type type
TEXTURE_FILTER_MIPMAP_LINEAR,
&xmb->textures.bg);
break;
case MENU_IMAGE_BOXART:
case MENU_IMAGE_THUMBNAIL:
{
struct texture_image *img = (struct texture_image*)data;
xmb->boxart_height = xmb->boxart_width
xmb->thumbnail_height = xmb->thumbnail_width
* (float)img->height / (float)img->width;
video_driver_texture_load(data,
TEXTURE_FILTER_MIPMAP_LINEAR, &xmb->boxart);
TEXTURE_FILTER_MIPMAP_LINEAR, &xmb->thumbnail);
}
break;
}
@ -2527,8 +2547,8 @@ static void xmb_context_reset(void *data)
xmb_context_reset_background(iconpath);
xmb_context_reset_horizontal_list(xmb, themepath);
if (settings->menu.boxart_enable)
xmb_update_boxart_image(xmb);
if (strcmp(xmb_thumbnails_ident(), "OFF"))
xmb_update_thumbnail_image(xmb);
}
static void xmb_navigation_clear(void *data, bool pending_push)

2
menu/drivers/zarch.c
View File

@ -1218,7 +1218,7 @@ static bool zarch_load_image(void *userdata,
TEXTURE_FILTER_MIPMAP_LINEAR,
&zui->textures.bg);
break;
case MENU_IMAGE_BOXART:
case MENU_IMAGE_THUMBNAIL:
break;
}

4
menu/intl/menu_hash_de.c
View File

@ -160,8 +160,6 @@ const char *menu_hash_to_str_de(uint32_t hash)
return "Assets-Verzeichnis";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:
return "Dynamische-Bildschirmhintergründe-Verzeichnis";
case MENU_LABEL_VALUE_BOXARTS_DIRECTORY:
return "Boxart-Verzeichnis";
case MENU_LABEL_VALUE_RGUI_BROWSER_DIRECTORY:
return "Browser-Directory";
case MENU_LABEL_VALUE_RGUI_CONFIG_DIRECTORY:
@ -542,8 +540,6 @@ const char *menu_hash_to_str_de(uint32_t hash)
return "Menühintergrund";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPER:
return "Dynamischer Hintergrund";
case MENU_LABEL_VALUE_BOXART:
return "Zeige Boxart";
case MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS:
return "Core-Input-Optionen";
case MENU_LABEL_VALUE_SHADER_OPTIONS:

4
menu/intl/menu_hash_es.c
View File

@ -269,8 +269,6 @@ const char *menu_hash_to_str_es(uint32_t hash)
return "Carpeta de recursos";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:
return "Carpeta de fondos de pantalla dinámicos";
case MENU_LABEL_VALUE_BOXARTS_DIRECTORY:
return "Carpeta de carátulas";
case MENU_LABEL_VALUE_RGUI_BROWSER_DIRECTORY:
return "Carpeta del navegador de archivos";
case MENU_LABEL_VALUE_RGUI_CONFIG_DIRECTORY:
@ -673,8 +671,6 @@ const char *menu_hash_to_str_es(uint32_t hash)
return "Fondo del menú";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPER:
return "Fondo de pantalla dinámico";
case MENU_LABEL_VALUE_BOXART:
return "Mostrar carátula";
case MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS:
return "Opciones de entrada del núcleo";
case MENU_LABEL_VALUE_SHADER_OPTIONS:

6
menu/intl/menu_hash_fr.c
View File

@ -175,7 +175,7 @@ const char *menu_hash_to_str_fr(uint32_t hash)
return "Dossier des assets";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:
return "Dossier des fonds d'écran dynamiques";
case MENU_LABEL_VALUE_BOXARTS_DIRECTORY:
case MENU_LABEL_VALUE_THUMBNAILS_DIRECTORY:
return "Dossier des vignettes";
case MENU_LABEL_VALUE_RGUI_BROWSER_DIRECTORY:
return "Dossier racine de navigation";
@ -551,8 +551,8 @@ const char *menu_hash_to_str_fr(uint32_t hash)
return "Fond d'écran";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPER:
return "Fond d'écran dynamique";
case MENU_LABEL_VALUE_BOXART:
return "Afficher les vignettes";
case MENU_LABEL_VALUE_THUMBNAILS:
return "Vignettes";
case MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS: /* TODO/FIXME */
return "Options de remap d'entrées du coeur";
case MENU_LABEL_VALUE_SHADER_OPTIONS:

4
menu/intl/menu_hash_it.c
View File

@ -279,8 +279,6 @@ const char *menu_hash_to_str_it(uint32_t hash)
return "Directory degli asset";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:
return "Directory degli sfondi dinamici";
case MENU_LABEL_VALUE_BOXARTS_DIRECTORY:
return "Directory copertine";
case MENU_LABEL_VALUE_RGUI_BROWSER_DIRECTORY:
return "Directory di selezione file";
case MENU_LABEL_VALUE_RGUI_CONFIG_DIRECTORY:
@ -671,8 +669,6 @@ const char *menu_hash_to_str_it(uint32_t hash)
return "Menù sfondi";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPER:
return "Sfondo dinamico";
case MENU_LABEL_VALUE_BOXART:
return "Mostra Copertina";
case MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS:
return "Opzioni di rimappatura degli input del core";
case MENU_LABEL_VALUE_SHADER_OPTIONS:

4
menu/intl/menu_hash_nl.c
View File

@ -206,8 +206,6 @@ const char *menu_hash_to_str_nl(uint32_t hash)
return "Assets Map";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:
return "Dynamische Wallpapers Map";
case MENU_LABEL_VALUE_BOXARTS_DIRECTORY:
return "Boxarts Map";
case MENU_LABEL_VALUE_RGUI_BROWSER_DIRECTORY:
return "Bestandsbeheer Map";
case MENU_LABEL_VALUE_RGUI_CONFIG_DIRECTORY:
@ -586,8 +584,6 @@ const char *menu_hash_to_str_nl(uint32_t hash)
return "Menu Wallpaper";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPER:
return "Dynamic Wallpaper";
case MENU_LABEL_VALUE_BOXART:
return "Boxart weergeven";
case MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS:
return "Core Invoer Opties";
case MENU_LABEL_VALUE_SHADER_OPTIONS:

4
menu/intl/menu_hash_pl.c
View File

@ -170,8 +170,6 @@ const char *menu_hash_to_str_pl(uint32_t hash)
return "Katalog assetów";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:
return "Katalog dynamicznych tapet";
case MENU_LABEL_VALUE_BOXARTS_DIRECTORY:
return "Katalog ok³adek";
case MENU_LABEL_VALUE_RGUI_BROWSER_DIRECTORY:
return "Katalog przegl±darki";
case MENU_LABEL_VALUE_RGUI_CONFIG_DIRECTORY:
@ -552,8 +550,6 @@ const char *menu_hash_to_str_pl(uint32_t hash)
return "Tapeta menu";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPER:
return "Dynamiczna tapeta";
case MENU_LABEL_VALUE_BOXART:
return "Wy¶wietlaj ok³adkê";
case MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS:
return "Opcje remapowania kontrolera rdzenia"; /* this is quite bad */
case MENU_LABEL_VALUE_SHADER_OPTIONS:

4
menu/intl/menu_hash_pt.c
View File

@ -161,8 +161,6 @@ const char *menu_hash_to_str_pt(uint32_t hash)
return "Recursos (Assets)";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:
return "Papéis de Parede Dinâmicos";
case MENU_LABEL_VALUE_BOXARTS_DIRECTORY:
return "Boxarts";
case MENU_LABEL_VALUE_RGUI_BROWSER_DIRECTORY:
return "Navegação";
case MENU_LABEL_VALUE_RGUI_CONFIG_DIRECTORY:
@ -541,8 +539,6 @@ const char *menu_hash_to_str_pt(uint32_t hash)
return "Papel de Parede do Menu";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPER:
return "Papel de Parede Dinâmico";
case MENU_LABEL_VALUE_BOXART:
return "Mostrar Boxart";
case MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS: /* TODO/FIXME */
return "Opções de Remapeamento de Controlador de Core";
case MENU_LABEL_VALUE_SHADER_OPTIONS:

16
menu/intl/menu_hash_us.c
View File

@ -222,8 +222,8 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
return "assets_directory";
case MENU_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY:
return "dynamic_wallpapers_directory";
case MENU_LABEL_BOXARTS_DIRECTORY:
return "boxarts_directory";
case MENU_LABEL_THUMBNAILS_DIRECTORY:
return "thumbnails_directory";
case MENU_LABEL_RGUI_BROWSER_DIRECTORY:
return "rgui_browser_directory";
case MENU_LABEL_RGUI_CONFIG_DIRECTORY:
@ -684,8 +684,8 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
return "menu_wallpaper";
case MENU_LABEL_DYNAMIC_WALLPAPER:
return "menu_dynamic_wallpaper_enable";
case MENU_LABEL_BOXART:
return "menu_boxart_enable";
case MENU_LABEL_THUMBNAILS:
return "thumbnails";
case MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS:
return "core_input_remapping_options";
case MENU_LABEL_SHADER_OPTIONS:
@ -976,8 +976,8 @@ const char *menu_hash_to_str_us(uint32_t hash)
return "Assets Dir";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:
return "Dynamic Wallpapers Dir";
case MENU_LABEL_VALUE_BOXARTS_DIRECTORY:
return "Boxarts Dir";
case MENU_LABEL_VALUE_THUMBNAILS_DIRECTORY:
return "Thumbnails Dir";
case MENU_LABEL_VALUE_RGUI_BROWSER_DIRECTORY:
return "File Browser Dir";
case MENU_LABEL_VALUE_RGUI_CONFIG_DIRECTORY:
@ -1392,8 +1392,8 @@ const char *menu_hash_to_str_us(uint32_t hash)
return "Menu Wallpaper";
case MENU_LABEL_VALUE_DYNAMIC_WALLPAPER:
return "Dynamic Wallpaper";
case MENU_LABEL_VALUE_BOXART:
return "Display Boxart";
case MENU_LABEL_VALUE_THUMBNAILS:
return "Thumbnails";
case MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS:
return "Core Input Options";
case MENU_LABEL_VALUE_SHADER_OPTIONS:

2
menu/menu_driver.h
View File

@ -58,7 +58,7 @@ enum menu_image_type
{
MENU_IMAGE_NONE = 0,
MENU_IMAGE_WALLPAPER,
MENU_IMAGE_BOXART
MENU_IMAGE_THUMBNAIL
};
enum menu_environ_cb

8
menu/menu_hash.h
View File

@ -438,8 +438,8 @@ extern "C" {
#define MENU_LABEL_VALUE_MENU_WALLPAPER 0x4555d2a2U
#define MENU_LABEL_DYNAMIC_WALLPAPER 0xf011ccabU
#define MENU_LABEL_VALUE_DYNAMIC_WALLPAPER 0x66928c32U
#define MENU_LABEL_VALUE_BOXART 0x716441ebU
#define MENU_LABEL_BOXART 0xa269b0afU
#define MENU_LABEL_THUMBNAILS 0x0a3ec67cU
#define MENU_LABEL_VALUE_THUMBNAILS 0x88eca25cU
#define MENU_LABEL_FASTFORWARD_RATIO 0x3a0c2706U
#define MENU_LABEL_VALUE_FASTFORWARD_RATIO 0x3c719749U
@ -545,8 +545,8 @@ extern "C" {
#define MENU_LABEL_VALUE_SAVESTATE_DIRECTORY 0xe6e0732aU
#define MENU_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY 0x62f975b8U
#define MENU_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY 0x0a3a407aU
#define MENU_LABEL_BOXARTS_DIRECTORY 0x9e2bdbddU
#define MENU_LABEL_VALUE_BOXARTS_DIRECTORY 0x56a0b90aU
#define MENU_LABEL_THUMBNAILS_DIRECTORY 0xdea77410U
#define MENU_LABEL_VALUE_THUMBNAILS_DIRECTORY 0xcb99d0b1U
#define MENU_LABEL_SLOWMOTION_RATIO 0x626b3ffeU
#define MENU_LABEL_VALUE_SLOWMOTION_RATIO 0x81c6f8ecU

21
menu/menu_setting.c
View File

@ -5964,19 +5964,18 @@ static bool setting_append_list(
general_write_handler,
general_read_handler);
CONFIG_BOOL(
CONFIG_UINT(
list, list_info,
&settings->menu.boxart_enable,
menu_hash_to_str(MENU_LABEL_BOXART),
menu_hash_to_str(MENU_LABEL_VALUE_BOXART),
true,
menu_hash_to_str(MENU_VALUE_OFF),
menu_hash_to_str(MENU_VALUE_ON),
&settings->menu.thumbnails,
menu_hash_to_str(MENU_LABEL_THUMBNAILS),
menu_hash_to_str(MENU_LABEL_VALUE_THUMBNAILS),
0,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler);
menu_settings_list_current_add_range(list, list_info, 0, 3, 1, true, true);
CONFIG_BOOL(
list, list_info,
@ -6811,10 +6810,10 @@ static bool setting_append_list(
CONFIG_DIR(
list, list_info,
settings->boxarts_directory,
sizeof(settings->boxarts_directory),
menu_hash_to_str(MENU_LABEL_BOXARTS_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_BOXARTS_DIRECTORY),
settings->thumbnails_directory,
sizeof(settings->thumbnails_directory),
menu_hash_to_str(MENU_LABEL_THUMBNAILS_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_THUMBNAILS_DIRECTORY),
"",
menu_hash_to_str(MENU_VALUE_DIRECTORY_DEFAULT),
&group_info,

12
tasks/task_file_transfer.c
View File

@ -29,7 +29,7 @@
#include "../verbosity.h"
#define CB_MENU_WALLPAPER 0xb476e505U
#define CB_MENU_BOXART 0x68b307cdU
#define CB_MENU_THUMBNAIL 0x82f93a21U
enum nbio_image_status_enum
{
@ -149,7 +149,7 @@ static int cb_image_menu_wallpaper(void *data, size_t len)
return 0;
}
static int cb_image_menu_boxart(void *data, size_t len)
static int cb_image_menu_thumbnail(void *data, size_t len)
{
nbio_handle_t *nbio = (nbio_handle_t*)data;
@ -299,7 +299,7 @@ static int cb_nbio_image_menu_wallpaper(void *data, size_t len)
return cb_nbio_generic(nbio, &len);
}
static int cb_nbio_image_menu_boxart(void *data, size_t len)
static int cb_nbio_image_menu_thumbnail(void *data, size_t len)
{
nbio_handle_t *nbio = (nbio_handle_t*)data;
@ -307,7 +307,7 @@ static int cb_nbio_image_menu_boxart(void *data, size_t len)
return -1;
nbio->image.handle = rpng_alloc();
nbio->image.cb = &cb_image_menu_boxart;
nbio->image.cb = &cb_image_menu_thumbnail;
return cb_nbio_generic(nbio, &len);
}
@ -347,8 +347,8 @@ bool rarch_task_push_image_load(const char *fullpath,
if (cb_type_hash == CB_MENU_WALLPAPER)
nbio->cb = &cb_nbio_image_menu_wallpaper;
else if (cb_type_hash == CB_MENU_BOXART)
nbio->cb = &cb_nbio_image_menu_boxart;
else if (cb_type_hash == CB_MENU_THUMBNAIL)
nbio->cb = &cb_nbio_image_menu_thumbnail;
nbio_begin_read(handle);