Commit 0942bc62 authored by twinaphex's avatar twinaphex
Browse files

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

parents 438bb2eb c0d5579c
......@@ -29,6 +29,19 @@
#include <mmreg.h>
#include <audioclient.h>
#ifdef _MSC_VER
/* IID_IAudioClient 1CB9AD4C-DBFA-4c32-B178-C2F568A703B2 */
static const GUID IID_IAudioClient = { 0x1CB9AD4C, 0xDBFA, 0xB178, 0xC2, 0xF5, 0x68, 0xA7, 0x03, 0xB2 };
/* IID_IAudioRenderClient F294ACFC-3146-4483-A7BF-ADDCA7C260E2 */
static const GUID IID_IAudioRenderClient = { 0xF294ACFC, 0x3146, 0x4483, 0xA7BF, 0xAD, 0xDC, 0xA7, 0xC2, 0x60, 0xE2 };
/* IID_IMMDeviceEnumerator A95664D2-9614-4F35-A746-DE8DB63617E6 */
static const GUID IID_IMMDeviceEnumerator = { 0xA95664D2, 0x9614, 0x4F35, 0xA746, 0xDE, 0x8D, 0xB6, 0x36, 0x17, 0xE6 };
/* CLSID_MMDeviceEnumerator BCDE0395-E52F-467C-8E3D-C4579291692E */
static const GUID CLSID_MMDeviceEnumerator = { 0xBCDE0395, 0xE52F, 0x467C, 0x8E3D, 0xC4, 0x57, 0x92, 0x91, 0x69, 0x2E };
/* KSDATAFORMAT_SUBTYPE_IEEE_FLOAT 00000003-0000-0010-8000-00aa00389b71 */
static const GUID KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = { 0x00000003, 0x0000, 0x0010, 0x8000, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 };
#endif
#include <lists/string_list.h>
#include <queues/fifo_queue.h>
......
#ifdef HAVE_LAKKA_SWITCH
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
"GPU Overclock"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
"Acelera el procesador de video"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SWITCH_BACKLIGHT_CONTROL,
"Brillo de pantalla"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SWITCH_BACKLIGHT_CONTROL,
"Ajusta el brillo de la pantalla"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
"CPU Overclock"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SWITCH_CPU_PROFILE,
"Acelera el procesador"
)
#endif
MSG_HASH(
MSG_COMPILER,
"Compilador"
......@@ -8,7 +34,7 @@ MSG_HASH(
)
MSG_HASH(
MSG_NATIVE,
"Native")
"Nativo")
MSG_HASH(
MSG_DEVICE_DISCONNECTED_FROM_PORT,
"Dispositivo desconectado del puerto"
......@@ -1489,6 +1515,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_ARABIC,
"Árabe"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LANG_GREEK,
"Griego"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_ANALOG,
"Analógico izquierdo"
......@@ -2880,6 +2910,14 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE,
"Mostrar fecha y hora"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE,
"Estilo de fecha y hora"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_TIMEDATE_STYLE,
"Cambia la forma en que se muestra la fecha y hora"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TITLE_COLOR,
"Color de títulos del menú"
......@@ -4930,6 +4968,19 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_CHEAT_APPLY_AFTER_LOAD,
"Auto-aplicar los trucos después que el juego cargue"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CHEAT_REPEAT_COUNT,
"La cantidad de veces que el truco será aplicado.\n"
"Usar junto a las otras dos optionces de iteración para afectar regiones grandes de memoria"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CHEAT_REPEAT_ADD_TO_ADDRESS,
"Después de cada 'Número de iteraciones' la dirección de memoria será incrementada este número multiplicado por 'Tamaño de búsqueda de memoria'"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CHEAT_REPEAT_ADD_TO_VALUE,
"Después de cada 'Número de iteraciones' el Valor será incrementado esta cantidad"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_REWIND_GRANULARITY,
"Rebobinar un determinado número de frames a la vez, para aumentar la velocidad del rebobinado"
......@@ -6378,7 +6429,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_THEME_SYSTEM_DEFAULT,
"<Por defeco>"
"<Por defecto>"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_THEME_DARK,
......@@ -6837,6 +6888,18 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_CHEAT_RUMBLE_SECONDARY_DURATION,
"Duración (ms) de la vibración secundaria"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_COUNT,
"Número de iteraciones"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_ADD_TO_VALUE,
"Incrementar Valor cada iteración"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_ADD_TO_ADDRESS,
"Incrementar Dirección cada iteración"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CHEAT_ADD_NEW_AFTER,
"Agregar nuevo truco después de este"
......@@ -7607,15 +7670,15 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
"Split Joy-Con"
"Joy-Con separados"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
"Reset To Defaults"
"Restablecer configuraciones"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
"Reset the current configuration to default values."
"Cambia la configuración acutal a los valores por defecto"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
......@@ -7627,43 +7690,61 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
"Basic White"
"Blanco Básico"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
"Basic Black"
"Negro Básico"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
"Select a different color theme."
)
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
"Use preferred system color theme")
MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
"Use your operating system's color theme (if any) - overrides theme settings.")
MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
"Lowest")
MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
"Lower")
MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
"Normal")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest")
"Seleccione un color diferente"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
"Usar los colores del sistema"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
"Preferir los colores del sistema operativo si están disponibles"
)
MSG_HASH(
MSG_RESAMPLER_QUALITY_LOWEST,
"Muy Baja"
)
MSG_HASH(
MSG_RESAMPLER_QUALITY_LOWER,
"Baja"
)
MSG_HASH(
MSG_RESAMPLER_QUALITY_NORMAL,
"Normal"
)
MSG_HASH(
MSG_RESAMPLER_QUALITY_HIGHER,
"Alta"
)
MSG_HASH(
MSG_RESAMPLER_QUALITY_HIGHEST,
"Ultra"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
"No hay música disponibles"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
"No videos available."
"No hay videos disponibles"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
"No images available."
"No hay imágenes disponibles"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
"No favorites available."
"No hay favoritos disponibles"
)
MSG_HASH(
MSG_MISSING_ASSETS,
"ADVERTENCIA: Faltan recursos, use el Actualizador si está disponible"
)
\ No newline at end of file
......@@ -2910,45 +2910,45 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE,
"Show date / time"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE,
"Style of date / time"
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE,
"Style of date / time"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_TIMEDATE_STYLE,
"Changes the style current date and/or time is shown inside the menu."
MSG_HASH(
MENU_ENUM_SUBLABEL_TIMEDATE_STYLE,
"Changes the style current date and/or time is shown inside the menu."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS,
"YYYY-MM-DD HH:MM:SS"
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS,
"YYYY-MM-DD HH:MM:SS"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM,
"YYYY-MM-DD HH:MM"
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM,
"YYYY-MM-DD HH:MM"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY,
"MM-DD-YYYY HH:MM"
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY,
"MM-DD-YYYY HH:MM"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS,
"HH:MM:SS"
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS,
"HH:MM:SS"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM,
"HH:MM"
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM,
"HH:MM"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DM_HM,
"DD/MM HH:MM"
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DM_HM,
"DD/MM HH:MM"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM,
"MM/DD HH:MM"
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM,
"MM/DD HH:MM"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_AM_PM,
"HH:MM:SS (AM/PM)"
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_AM_PM,
"HH:MM:SS (AM/PM)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TITLE_COLOR,
......@@ -4995,19 +4995,20 @@ MSG_HASH(
MSG_HASH(
MENU_ENUM_SUBLABEL_CHEAT_APPLY_AFTER_TOGGLE,
"Apply cheat immediately after toggling."
)
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CHEAT_APPLY_AFTER_LOAD,
"Auto-apply cheats when game loads."
)
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CHEAT_REPEAT_COUNT,
"The number of times the cheat will be applied. Use with the other two Iteration options to affect large areas of memory."
"The number of times the cheat will be applied.\n"
"Use with the other two Iteration options to affect large areas of memory."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CHEAT_REPEAT_ADD_TO_ADDRESS,
"After each 'Number of Iterations' the Memory Address will be increased by this number times the 'Memory Search Size'."
)
)
MSG_HASH(
MENU_ENUM_SUBLABEL_CHEAT_REPEAT_ADD_TO_VALUE,
"After each 'Number of Iterations' the Value will be increased by this amount."
......@@ -6922,15 +6923,15 @@ MSG_HASH(
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_COUNT,
"Number of Iterations"
)
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_ADD_TO_VALUE,
"Value Increase Each Iteration"
)
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_ADD_TO_ADDRESS,
"Address Increase Each Iteration"
)
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CHEAT_ADD_NEW_AFTER,
"Add New Cheat After This One"
......@@ -7731,20 +7732,34 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
"Select a different color theme."
)
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
"Use preferred system color theme")
MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
"Use your operating system's color theme (if any) - overrides theme settings.")
MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
"Lowest")
MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
"Lower")
MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
"Normal")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
"Higher")
MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
"Use preferred system color theme"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
"Use your operating system's color theme (if any) - overrides theme settings."
)
MSG_HASH(
MSG_RESAMPLER_QUALITY_LOWEST,
"Lowest"
)
MSG_HASH(
MSG_RESAMPLER_QUALITY_LOWER,
"Lower"
)
MSG_HASH(
MSG_RESAMPLER_QUALITY_NORMAL,
"Normal"
)
MSG_HASH(
MSG_RESAMPLER_QUALITY_HIGHER,
"Higher"
)
MSG_HASH(
MSG_RESAMPLER_QUALITY_HIGHEST,
"Highest"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
"No music available."
......@@ -7761,3 +7776,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
"No favorites available."
)
MSG_HASH(
MSG_MISSING_ASSETS,
"Warning: Missing assets, use the Online Updater if available"
)
\ No newline at end of file
......@@ -2122,10 +2122,11 @@ static void ozone_context_reset(void *data, bool is_threaded)
ozone->animations.list_alpha = 1.0f;
/* Missing assets message */
/* TODO Localize */
if (!ozone->has_all_assets)
runloop_msg_queue_push("Some assets are missing - please update them", 1, 256, false);
{
RARCH_WARN("[OZONE] Assets missing\n");
runloop_msg_queue_push(msg_hash_to_str(MSG_MISSING_ASSETS), 1, 256, false);
}
ozone_restart_cursor_animation(ozone);
}
}
......
......@@ -4924,11 +4924,8 @@ static const char *xmb_texture_path(unsigned id)
if (!filestream_exists(icon_fullpath))
{
/* If the icon doesn't exist at least try to return the subsetting icon*/
if (id == XMB_TEXTURE_DIALOG_SLICE || id == XMB_TEXTURE_KEY_HOVER || id == XMB_TEXTURE_KEY_HOVER)
return NULL;
else
return "subsetting.png";
RARCH_WARN("[XMB] Asset missing: %s\n", icon_fullpath);
return NULL;
}
else
return icon_name;
......@@ -4939,9 +4936,25 @@ static void xmb_context_reset_textures(
xmb_handle_t *xmb, const char *iconpath)
{
unsigned i;
settings_t *settings = config_get_ptr();
for (i = 0; i < XMB_TEXTURE_LAST; i++)
{
if (xmb_texture_path(i) == NULL)
{
/* If the icon doesn't exist at least try to return the subsetting icon*/
if (!(i == XMB_TEXTURE_DIALOG_SLICE || i == XMB_TEXTURE_KEY_HOVER || i == XMB_TEXTURE_KEY_HOVER))
menu_display_reset_textures_list(xmb_texture_path(XMB_TEXTURE_SUBSETTING), iconpath, &xmb->textures.list[i], TEXTURE_FILTER_MIPMAP_LINEAR);
continue;
}
menu_display_reset_textures_list(xmb_texture_path(i), iconpath, &xmb->textures.list[i], TEXTURE_FILTER_MIPMAP_LINEAR);
}
/* Warn only if critical assets are missing, some themes are incomplete */
if (
((xmb_texture_path(XMB_TEXTURE_SUBSETTING) == NULL)) && !(settings->uints.menu_xmb_theme == XMB_ICON_THEME_CUSTOM)
)
runloop_msg_queue_push(msg_hash_to_str(MSG_MISSING_ASSETS), 1, 256, false);
menu_display_allocate_white_texture();
......@@ -4986,6 +4999,7 @@ static void xmb_context_reset_textures(
xmb->netplay_tab_node.alpha = xmb->categories_active_alpha;
xmb->netplay_tab_node.zoom = xmb->categories_active_zoom;
#endif
}
static void xmb_context_reset_background(const char *iconpath)
......
......@@ -421,6 +421,8 @@ enum msg_hash_enums
MSG_RUNAHEAD_FAILED_TO_SAVE_STATE,
MSG_RUNAHEAD_FAILED_TO_LOAD_STATE,
MSG_RUNAHEAD_FAILED_TO_CREATE_SECONDARY_INSTANCE,
MSG_MISSING_ASSETS,
MENU_LABEL(STREAMING_TITLE),
MENU_LABEL(STREAMING_MODE),
MENU_LABEL(VIDEO_RECORD_QUALITY),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment