ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More string_is_equal optimizations; localize more strings

This commit is contained in:
twinaphex 2020-06-08 22:46:56 +02:00
parent 2ae0583ac5
commit b183abbb0f
2 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/gfx_widgets.c
View File

@ -1645,7 +1645,8 @@ void gfx_widgets_frame(void *data)
) )
{ {
const char *text = *p_dispwidget->gfx_widgets_fps_text == '\0' const char *text = *p_dispwidget->gfx_widgets_fps_text == '\0'
? "N/A" : p_dispwidget->gfx_widgets_fps_text; ? msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE)
: p_dispwidget->gfx_widgets_fps_text;
int text_width = font_driver_get_message_width( int text_width = font_driver_get_message_width(
p_dispwidget->gfx_widget_fonts.regular.font, p_dispwidget->gfx_widget_fonts.regular.font,

62
retroarch.c
View File

@ -23317,16 +23317,22 @@ static void menu_input_pointer_close_messagebox(struct rarch_state *p_rarch)
/* > Info box */ /* > Info box */
if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_INFO_SCREEN))) if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_INFO_SCREEN)))
pop_stack = true; pop_stack = true;
/* > Help box */ /* > Help box */
if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP)) || if (string_starts_with(label, "help"))
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_CONTROLS)) || if (
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_WHAT_IS_A_CORE)) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP))
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_LOADING_CONTENT)) || || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_CONTROLS))
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_SCANNING_CONTENT)) || || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_WHAT_IS_A_CORE))
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD)) || || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_LOADING_CONTENT))
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING)) || || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_SCANNING_CONTENT))
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_SEND_DEBUG_INFO)) || || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD))
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CHEEVOS_DESCRIPTION))) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING))
|| string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_SEND_DEBUG_INFO))
|| string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CHEEVOS_DESCRIPTION)))
pop_stack = true;
if (
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CHEEVOS_DESCRIPTION)))
pop_stack = true; pop_stack = true;
/* Pop stack, if required */ /* Pop stack, if required */
@ -26755,10 +26761,10 @@ const char *audio_driver_mixer_get_stream_name(unsigned i)
{ {
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
if (i > (AUDIO_MIXER_MAX_SYSTEM_STREAMS-1)) if (i > (AUDIO_MIXER_MAX_SYSTEM_STREAMS-1))
return "N/A"; return msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE);
if (!string_is_empty(p_rarch->audio_mixer_streams[i].name)) if (!string_is_empty(p_rarch->audio_mixer_streams[i].name))
return p_rarch->audio_mixer_streams[i].name; return p_rarch->audio_mixer_streams[i].name;
return "N/A"; return msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE);
} }
static void audio_driver_mixer_deinit(struct rarch_state *p_rarch) static void audio_driver_mixer_deinit(struct rarch_state *p_rarch)
@ -31540,24 +31546,30 @@ enum gfx_ctx_api video_context_driver_get_api(void)
const char *video_ident = (p_rarch->current_video) const char *video_ident = (p_rarch->current_video)
? p_rarch->current_video->ident ? p_rarch->current_video->ident
: NULL; : NULL;
if (string_is_equal(video_ident, "d3d9")) if (string_starts_with(video_ident, "d3d"))
return GFX_CTX_DIRECT3D9_API; {
else if (string_is_equal(video_ident, "d3d10")) if (string_is_equal(video_ident, "d3d9"))
return GFX_CTX_DIRECT3D10_API; return GFX_CTX_DIRECT3D9_API;
else if (string_is_equal(video_ident, "d3d11")) else if (string_is_equal(video_ident, "d3d10"))
return GFX_CTX_DIRECT3D11_API; return GFX_CTX_DIRECT3D10_API;
else if (string_is_equal(video_ident, "d3d12")) else if (string_is_equal(video_ident, "d3d11"))
return GFX_CTX_DIRECT3D12_API; return GFX_CTX_DIRECT3D11_API;
else if (string_is_equal(video_ident, "d3d12"))
return GFX_CTX_DIRECT3D12_API;
}
if (string_starts_with(video_ident, "gl"))
{
if (string_is_equal(video_ident, "gl"))
return GFX_CTX_OPENGL_API;
else if (string_is_equal(video_ident, "gl1"))
return GFX_CTX_OPENGL_API;
else if (string_is_equal(video_ident, "glcore"))
return GFX_CTX_OPENGL_API;
}
else if (string_is_equal(video_ident, "gx2")) else if (string_is_equal(video_ident, "gx2"))
return GFX_CTX_GX2_API; return GFX_CTX_GX2_API;
else if (string_is_equal(video_ident, "gx")) else if (string_is_equal(video_ident, "gx"))
return GFX_CTX_GX_API; return GFX_CTX_GX_API;
else if (string_is_equal(video_ident, "gl"))
return GFX_CTX_OPENGL_API;
else if (string_is_equal(video_ident, "gl1"))
return GFX_CTX_OPENGL_API;
else if (string_is_equal(video_ident, "glcore"))
return GFX_CTX_OPENGL_API;
else if (string_is_equal(video_ident, "vulkan")) else if (string_is_equal(video_ident, "vulkan"))
return GFX_CTX_VULKAN_API; return GFX_CTX_VULKAN_API;
else if (string_is_equal(video_ident, "metal")) else if (string_is_equal(video_ident, "metal"))