diff --git a/intl/msg_hash_ar.c b/intl/msg_hash_ar.c index 808463ba57..ab9d5ba34a 100644 --- a/intl/msg_hash_ar.c +++ b/intl/msg_hash_ar.c @@ -33,7 +33,6 @@ int menu_hash_get_help_ar_enum(enum msg_hash_enums msg, char *s, size_t len) { - uint32_t driver_hash = 0; settings_t *settings = config_get_ptr(); if (msg == MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM) @@ -717,45 +716,41 @@ int menu_hash_get_help_ar_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_INPUT_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.input_driver); + { + const char *lbl = settings ? settings->arrays.input_driver : NULL; - switch (driver_hash) { - case MENU_LABEL_INPUT_DRIVER_UDEV: - snprintf(s, len, - "udev Input driver. \n" - " \n" - "It uses the recent evdev joypad API \n" - "for joystick support. It supports \n" - "hotplugging and force feedback. \n" - " \n" - "The driver reads evdev events for keyboard \n" - "support. It also supports keyboard callback, \n" - "mice and touchpads. \n" - " \n" - "By default in most distros, /dev/input nodes \n" - "are root-only (mode 600). You can set up a udev \n" - "rule which makes these accessible to non-root." - ); - break; - case MENU_LABEL_INPUT_DRIVER_LINUXRAW: - snprintf(s, len, - "linuxraw Input driver. \n" - " \n" - "This driver requires an active TTY. Keyboard \n" - "events are read directly from the TTY which \n" - "makes it simpler, but not as flexible as udev. \n" "Mice, etc, are not supported at all. \n" - " \n" - "This driver uses the older joystick API \n" - "(/dev/input/js*)."); - break; - default: - snprintf(s, len, - "Input driver.\n" - " \n" - "Depending on video driver, it might \n" - "force a different input driver."); - break; + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_UDEV))) + snprintf(s, len, + "udev Input driver. \n" + " \n" + "It uses the recent evdev joypad API \n" + "for joystick support. It supports \n" + "hotplugging and force feedback. \n" + " \n" + "The driver reads evdev events for keyboard \n" + "support. It also supports keyboard callback, \n" + "mice and touchpads. \n" + " \n" + "By default in most distros, /dev/input nodes \n" + "are root-only (mode 600). You can set up a udev \n" + "rule which makes these accessible to non-root." + ); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW))) + snprintf(s, len, + "linuxraw Input driver. \n" + " \n" + "This driver requires an active TTY. Keyboard \n" + "events are read directly from the TTY which \n" + "makes it simpler, but not as flexible as udev. \n" "Mice, etc, are not supported at all. \n" + " \n" + "This driver uses the older joystick API \n" + "(/dev/input/js*)."); + else + snprintf(s, len, + "Input driver.\n" + " \n" + "Depending on video driver, it might \n" + "force a different input driver."); } break; case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: @@ -879,22 +874,17 @@ int menu_hash_get_help_ar_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); + { + const char *lbl = settings ? settings->arrays.audio_resampler : NULL; - switch (driver_hash) { - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC: - snprintf(s, len, - "Windowed SINC implementation."); - break; - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC: - snprintf(s, len, - "Convoluted Cosine implementation."); - break; - default: - if (string_is_empty(s)) - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); - break; + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC))) + strlcpy(s, + "Windowed SINC implementation.", len); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC))) + strlcpy(s, + "Convoluted Cosine implementation.", len); + else if (string_is_empty(s)) + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); } break; case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c index 7831fbcc7d..91ba1d0d3a 100644 --- a/intl/msg_hash_chs.c +++ b/intl/msg_hash_chs.c @@ -32,7 +32,6 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) { - uint32_t driver_hash = 0; settings_t *settings = config_get_ptr(); if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END && @@ -673,12 +672,10 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_INPUT_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.input_driver); - - switch (driver_hash) { - case MENU_LABEL_INPUT_DRIVER_UDEV: + const char *lbl = settings ? settings->arrays.input_driver : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_UDEV))) snprintf(s, len, "udev Input driver. \n" " \n" @@ -697,8 +694,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "are root-only (mode 600). You can set up a udev \n" "rule which makes these accessible to non-root." ); - break; - case MENU_LABEL_INPUT_DRIVER_LINUXRAW: + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW))) snprintf(s, len, "linuxraw Input driver. \n" " \n" @@ -708,14 +704,12 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) " \n" "This driver uses the older joystick API \n" "(/dev/input/js*)."); - break; - default: + else snprintf(s, len, "Input driver.\n" " \n" "Depending on video driver, it might \n" "force a different input driver."); - break; } break; case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: @@ -837,23 +831,17 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); - - switch (driver_hash) { - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC: - snprintf(s, len, - "Windowed SINC implementation."); - break; - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC: - snprintf(s, len, - "Convoluted Cosine implementation."); - break; - default: - if (string_is_empty(s)) - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); - break; + const char *lbl = settings ? settings->arrays.audio_resampler : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC))) + strlcpy(s, + "Windowed SINC implementation.", len); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC))) + strlcpy(s, + "Convoluted Cosine implementation.", len); + else if (string_is_empty(s)) + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); } break; case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: diff --git a/intl/msg_hash_cht.c b/intl/msg_hash_cht.c index ba696a59a2..36c7d0d5b2 100644 --- a/intl/msg_hash_cht.c +++ b/intl/msg_hash_cht.c @@ -32,7 +32,6 @@ int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len) { - uint32_t driver_hash = 0; settings_t *settings = config_get_ptr(); if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END && @@ -670,12 +669,10 @@ int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_INPUT_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.input_driver); - - switch (driver_hash) { - case MENU_LABEL_INPUT_DRIVER_UDEV: + const char *lbl = settings ? settings->arrays.input_driver : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_UDEV))) snprintf(s, len, "udev Input driver. \n" " \n" @@ -694,8 +691,7 @@ int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len) "are root-only (mode 600). You can set up a udev \n" "rule which makes these accessible to non-root." ); - break; - case MENU_LABEL_INPUT_DRIVER_LINUXRAW: + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW))) snprintf(s, len, "linuxraw Input driver. \n" " \n" @@ -705,14 +701,12 @@ int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len) " \n" "This driver uses the older joystick API \n" "(/dev/input/js*)."); - break; - default: + else snprintf(s, len, "Input driver.\n" " \n" "Depending on video driver, it might \n" "force a different input driver."); - break; } break; case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: @@ -834,23 +828,17 @@ int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); - - switch (driver_hash) { - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC: - snprintf(s, len, - "Windowed SINC implementation."); - break; - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC: - snprintf(s, len, - "Convoluted Cosine implementation."); - break; - default: - if (string_is_empty(s)) - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); - break; + const char *lbl = settings ? settings->arrays.audio_resampler : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC))) + strlcpy(s, + "Windowed SINC implementation.", len); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC))) + strlcpy(s, + "Convoluted Cosine implementation.", len); + else if (string_is_empty(s)) + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); } break; case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: diff --git a/intl/msg_hash_de.c b/intl/msg_hash_de.c index ececc198a5..559709b335 100644 --- a/intl/msg_hash_de.c +++ b/intl/msg_hash_de.c @@ -28,7 +28,6 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) { - uint32_t driver_hash = 0; settings_t *settings = config_get_ptr(); if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END && @@ -702,12 +701,10 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_INPUT_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.input_driver); - - switch (driver_hash) { - case MENU_LABEL_INPUT_DRIVER_UDEV: + const char *lbl = settings ? settings->arrays.input_driver : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_UDEV))) snprintf(s, len, "udev-Eingabetreiber. \n" " \n" @@ -725,8 +722,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) "Regel erstellen, die auch den Zugriff für andere \n" "Benutzer erlaubt." ); - break; - case MENU_LABEL_INPUT_DRIVER_LINUXRAW: + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW))) snprintf(s, len, "linuxraw-Eingabetreiber. \n" " \n" @@ -737,14 +733,12 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) " \n" "Dieser Treiber verwendet die alte Joystick-API \n" "(/dev/input/js*)."); - break; - default: - snprintf(s, len, - "Eingabetreiber.\n" - " \n" - "Abhängig vom Grafiktreiber kann ein anderer Eingabe- \n" - "treiber erzwungen werden."); - break; + else + snprintf(s, len, + "Eingabetreiber.\n" + " \n" + "Abhängig vom Grafiktreiber kann ein anderer Eingabe- \n" + "treiber erzwungen werden."); } break; case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: @@ -866,23 +860,17 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); - - switch (driver_hash) { - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC: - snprintf(s, len, - "Windowed-SINC-Implementierung."); - break; - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC: - snprintf(s, len, - "Convoluted-Kosinus-Implementierung."); - break; - default: - if (string_is_empty(s)) - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); - break; + const char *lbl = settings ? settings->arrays.audio_resampler : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC))) + strlcpy(s, + "Windowed-SINC-Implementierung.", len); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC))) + strlcpy(s, + "Convoluted-Kosinus-Implementierung.", len); + else if (string_is_empty(s)) + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); } break; case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c index 3d97751946..00bf838c73 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -30,7 +30,6 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) { - uint32_t driver_hash = 0; settings_t *settings = config_get_ptr(); switch (msg) @@ -129,43 +128,41 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) strlcpy(s, "Extrayendo, espera, por favor...\n", len); break; case MENU_ENUM_LABEL_INPUT_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.input_driver); - - switch (driver_hash) { - case MENU_LABEL_INPUT_DRIVER_UDEV: - { - /* Work around C89 limitations */ - char u[501]; - char t[501]; + const char *lbl = settings ? settings->arrays.input_driver : NULL; - strlcpy(t, - "Controlador de entrada udev. \n" - " \n" - "Utiliza la API evdev más reciente \n" - "para dar compatibilidad con mandos. \n" - "Permite hotplug (conexión en caliente) \n" - "y force feedback (fuerza de respuesta). \n", - sizeof(t)); - strlcpy(u, - " \n" - "El controlador lee los eventos evdev para \n" - "dar compatibilidad con teclados. También \n" - "es compatible con callbacks de teclado, \n" - "ratones y pantallas táctiles. \n" - " \n" - "La mayoría de las distros tienen los nodos \n" - "/dev/input en modo solo root (modo 600). \n" - "Puedes configurar una regla udev que los haga \n" - "accesibles a otros usuarios.", sizeof(u) - ); + if (string_is_equal(lbl, msg_hash_to_str( + MENU_ENUM_LABEL_INPUT_DRIVER_UDEV))) + { + /* Work around C89 limitations */ + char u[501]; + char t[501]; - strlcpy(s, t, len); - strlcat(s, u, len); - } - break; - case MENU_LABEL_INPUT_DRIVER_LINUXRAW: + strlcpy(t, + "Controlador de entrada udev. \n" + " \n" + "Utiliza la API evdev más reciente \n" + "para dar compatibilidad con mandos. \n" + "Permite hotplug (conexión en caliente) \n" + "y force feedback (fuerza de respuesta). \n", + sizeof(t)); + strlcpy(u, + " \n" + "El controlador lee los eventos evdev para \n" + "dar compatibilidad con teclados. También \n" + "es compatible con callbacks de teclado, \n" + "ratones y pantallas táctiles. \n" + " \n" + "La mayoría de las distros tienen los nodos \n" + "/dev/input en modo solo root (modo 600). \n" + "Puedes configurar una regla udev que los haga \n" + "accesibles a otros usuarios.", sizeof(u) + ); + + strlcpy(s, t, len); + strlcat(s, u, len); + } + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW))) snprintf(s, len, "Controlador de entrada linuxraw. \n" " \n" @@ -177,15 +174,13 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) " \n" "Este controlador utiliza la antigua API de mandos \n" "(/dev/input/js*)."); - break; - default: + else snprintf(s, len, "Controlador de entrada.\n" " \n" "El controlador de vídeo podría forzar \n" "el uso de un controlador de entrada \n" "distinto."); - break; } break; case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: @@ -320,19 +315,15 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); - - switch (driver_hash) { - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC: - snprintf(s, len, - "Implementación windowed SINC."); - break; - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC: - snprintf(s, len, - "Implementación de cosenos complejos."); - break; + const char *lbl = settings ? settings->arrays.audio_resampler : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC))) + strlcpy(s, + "Implementación windowed SINC.", len); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC))) + strlcpy(s, + "Implementación de cosenos complejos.", len); } break; case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c index d8dc11aa19..8fd5c4a755 100644 --- a/intl/msg_hash_it.c +++ b/intl/msg_hash_it.c @@ -25,7 +25,6 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) { - uint32_t driver_hash = 0; settings_t *settings = config_get_ptr(); switch (msg) @@ -122,37 +121,34 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) strlcpy(s, "Estraendo, per favore attendi...\n", len); break; case MENU_ENUM_LABEL_INPUT_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.input_driver); - - switch (driver_hash) { - case MENU_LABEL_INPUT_DRIVER_UDEV: - { - /* Work around C89 limitations */ - const char * t = - "udev Input driver. \n" - " \n" - "Questo driver può caricare senza X. \n" - " \n" - "Usa la recente evdev joypad API \n" - "per il supporto del joystick. Supporta \n" - "hotplugging e force feedback (se \n" - "supportato dal dispositivo). \n" - " \n"; - const char * u = - "Il driver legge gli eventi evdev per il supporto \n" - "della tastiera. Supporta anche la callback della tastiera, \n" - "mouse e touchpads. \n" - " \n" - "Come predefinito nella maggior parte delle distribuzioni, i nodi /dev/input \n" - "sono only-root (modalità 600). Puoi settare una regola udev \n" - "che fa queste accessibili ai non-root."; - strlcpy(s, t, len); - strlcat(s, u, len); - } - break; - case MENU_LABEL_INPUT_DRIVER_LINUXRAW: + const char *lbl = settings ? settings->arrays.input_driver : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_UDEV))) + { + /* Work around C89 limitations */ + const char * t = + "udev Input driver. \n" + " \n" + "Questo driver può caricare senza X. \n" + " \n" + "Usa la recente evdev joypad API \n" + "per il supporto del joystick. Supporta \n" + "hotplugging e force feedback (se \n" + "supportato dal dispositivo). \n" + " \n"; + const char * u = + "Il driver legge gli eventi evdev per il supporto \n" + "della tastiera. Supporta anche la callback della tastiera, \n" + "mouse e touchpads. \n" + " \n" + "Come predefinito nella maggior parte delle distribuzioni, i nodi /dev/input \n" + "sono only-root (modalità 600). Puoi settare una regola udev \n" + "che fa queste accessibili ai non-root."; + strlcpy(s, t, len); + strlcat(s, u, len); + } + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW))) snprintf(s, len, "linuxraw Input driver. \n" " \n" @@ -162,14 +158,12 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) " \n" "Questo driver usa la più vecchia API per il joystick \n" "(/dev/input/js*)."); - break; - default: + else snprintf(s, len, "Driver input.\n" " \n" "Dipende dal driver video, potrebbe \n" "forzare un differente driver input."); - break; } break; case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: @@ -284,19 +278,15 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); - - switch (driver_hash) { - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC: - snprintf(s, len, - "Implementazione SINC in modalità finestra."); - break; - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC: - snprintf(s, len, - "Implementazione coseno complesso."); - break; + const char *lbl = settings ? settings->arrays.audio_resampler : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC))) + strlcpy(s, + "Implementazione SINC in modalità finestra.", len); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC))) + strlcpy(s, + "Implementazione coseno complesso.", len); } break; case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: diff --git a/intl/msg_hash_ja.c b/intl/msg_hash_ja.c index fcef9422c0..31e93307aa 100644 --- a/intl/msg_hash_ja.c +++ b/intl/msg_hash_ja.c @@ -33,7 +33,6 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) { - uint32_t driver_hash = 0; settings_t *settings = config_get_ptr(); if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END && @@ -695,12 +694,10 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_INPUT_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.input_driver); - - switch (driver_hash) { - case MENU_LABEL_INPUT_DRIVER_UDEV: + const char *lbl = settings ? settings->arrays.input_driver : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_UDEV))) snprintf(s, len, "udev Input driver. \n" " \n" @@ -719,8 +716,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "are root-only (mode 600). You can set up a udev \n" "rule which makes these accessible to non-root." ); - break; - case MENU_LABEL_INPUT_DRIVER_LINUXRAW: + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW))) snprintf(s, len, "linuxraw Input driver. \n" " \n" @@ -730,14 +726,12 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) " \n" "This driver uses the older joystick API \n" "(/dev/input/js*)."); - break; - default: + else snprintf(s, len, "Input driver.\n" " \n" "Depending on video driver, it might \n" "force a different input driver."); - break; } break; case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: @@ -861,23 +855,17 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); - - switch (driver_hash) { - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC: - snprintf(s, len, - "Windowed SINC implementation."); - break; - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC: - snprintf(s, len, - "Convoluted Cosine implementation."); - break; - default: - if (string_is_empty(s)) - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); - break; + const char *lbl = settings ? settings->arrays.audio_resampler : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC))) + strlcpy(s, + "Windowed SINC implementation.", len); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC))) + strlcpy(s, + "Convoluted Cosine implementation.", len); + else if (string_is_empty(s)) + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); } break; case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: diff --git a/intl/msg_hash_ko.c b/intl/msg_hash_ko.c index eda672f460..faa82fb500 100644 --- a/intl/msg_hash_ko.c +++ b/intl/msg_hash_ko.c @@ -31,8 +31,8 @@ #pragma warning(disable: 4566) #endif -int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { - uint32_t driver_hash = 0; +int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) +{ settings_t *settings = config_get_ptr(); if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END && @@ -694,45 +694,41 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { ); break; case MENU_ENUM_LABEL_INPUT_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.input_driver); + { + const char *lbl = settings ? settings->arrays.input_driver : NULL; - switch (driver_hash) { - case MENU_LABEL_INPUT_DRIVER_UDEV: - snprintf(s, len, - "udev Input driver. \n" - " \n" - "It uses the recent evdev joypad API \n" - "for joystick support. It supports \n" - "hotplugging and force feedback. \n" - " \n" - "The driver reads evdev events for keyboard \n" - "support. It also supports keyboard callback, \n" - "mice and touchpads. \n" - " \n" - "By default in most distros, /dev/input nodes \n" - "are root-only (mode 600). You can set up a udev \n" - "rule which makes these accessible to non-root." - ); - break; - case MENU_LABEL_INPUT_DRIVER_LINUXRAW: - snprintf(s, len, - "linuxraw Input driver. \n" - " \n" - "This driver requires an active TTY. Keyboard \n" - "events are read directly from the TTY which \n" - "makes it simpler, but not as flexible as udev. \n" "Mice, etc, are not supported at all. \n" - " \n" - "This driver uses the older joystick API \n" - "(/dev/input/js*)."); - break; - default: - snprintf(s, len, - "Input driver.\n" - " \n" - "Depending on video driver, it might \n" - "force a different input driver."); - break; + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_UDEV))) + snprintf(s, len, + "udev Input driver. \n" + " \n" + "It uses the recent evdev joypad API \n" + "for joystick support. It supports \n" + "hotplugging and force feedback. \n" + " \n" + "The driver reads evdev events for keyboard \n" + "support. It also supports keyboard callback, \n" + "mice and touchpads. \n" + " \n" + "By default in most distros, /dev/input nodes \n" + "are root-only (mode 600). You can set up a udev \n" + "rule which makes these accessible to non-root." + ); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW))) + snprintf(s, len, + "linuxraw Input driver. \n" + " \n" + "This driver requires an active TTY. Keyboard \n" + "events are read directly from the TTY which \n" + "makes it simpler, but not as flexible as udev. \n" "Mice, etc, are not supported at all. \n" + " \n" + "This driver uses the older joystick API \n" + "(/dev/input/js*)."); + else + snprintf(s, len, + "Input driver.\n" + " \n" + "Depending on video driver, it might \n" + "force a different input driver."); } break; case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: @@ -855,22 +851,17 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { ); break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); + { + const char *lbl = settings ? settings->arrays.audio_resampler : NULL; - switch (driver_hash) { - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC: - snprintf(s, len, - "Windowed SINC implementation."); - break; - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC: - snprintf(s, len, - "Convoluted Cosine implementation."); - break; - default: - if (string_is_empty(s)) - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); - break; + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC))) + strlcpy(s, + "Windowed SINC implementation.", len); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC))) + strlcpy(s, + "Convoluted Cosine implementation.", len); + else if (string_is_empty(s)) + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); } break; case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index b82f0dc95c..435b040115 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -1399,3 +1399,11 @@ MSG_HASH(MENU_ENUM_LABEL_VIDEO_WINDOW_OPACITY, "video_window_opacity") MSG_HASH(MENU_ENUM_LABEL_AUDIO_RESAMPLER_QUALITY, "audio_resampler_quality") +MSG_HASH(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC, + "sinc") +MSG_HASH(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC, + "cc") +MSG_HASH(MENU_ENUM_LABEL_INPUT_DRIVER_UDEV, + "udev") +MSG_HASH(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW, + "linuxraw") diff --git a/intl/msg_hash_pt_br.c b/intl/msg_hash_pt_br.c index 5b0d02eaa1..cd955d0e7c 100644 --- a/intl/msg_hash_pt_br.c +++ b/intl/msg_hash_pt_br.c @@ -26,7 +26,6 @@ #include "../verbosity.h" int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) { - uint32_t driver_hash = 0; settings_t *settings = config_get_ptr(); if (msg == MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM) @@ -733,49 +732,45 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_INPUT_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.input_driver); + { + const char *lbl = settings ? settings->arrays.input_driver : NULL; - switch (driver_hash) { - case MENU_LABEL_INPUT_DRIVER_UDEV: - snprintf(s, len, - "Driver de entrada udev. \n" - " \n" - "Utiliza a recente API evdev joypad \n" - "para suporte a Joystick. Suporta \n" - "hotplugging e force feedback. \n" - " \n" - "O driver lê eventos evdev para suporte \n" - "a teclado. Tambêm suporta keyboard callback, \n" - "Mouses e Touchpads. \n" - " \n" - "Por padrão na maioria das distros, \n" - "nodes /dev/input são somente root (mode 600). \n" - "Você pode criar uma regra udev para torná-los \n" - "acessíveis para não root." - ); - break; - case MENU_LABEL_INPUT_DRIVER_LINUXRAW: - snprintf(s, len, - "Driver de entrada linuxraw. \n" - " \n" - "Este driver requer um TTY ativo. Eventos de \n" - "teclado são lidos diretamente do TTY o que \n" - "o torna simples, mas não tão flexível, \n" - "quanto udev. \n" - "Mouses, etc, não são suportados de nenhum \n" - "modo. \n" - " \n" - "Este driver utiliza a antiga API de Joystick \n" - "(/dev/input/js*)."); - break; - default: - snprintf(s, len, - "Driver de entrada.\n" - " \n" - "Dependendo do driver de vídeo, pode \n" - "forçar um driver de entrada diferente."); - break; + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_UDEV))) + snprintf(s, len, + "Driver de entrada udev. \n" + " \n" + "Utiliza a recente API evdev joypad \n" + "para suporte a Joystick. Suporta \n" + "hotplugging e force feedback. \n" + " \n" + "O driver lê eventos evdev para suporte \n" + "a teclado. Tambêm suporta keyboard callback, \n" + "Mouses e Touchpads. \n" + " \n" + "Por padrão na maioria das distros, \n" + "nodes /dev/input são somente root (mode 600). \n" + "Você pode criar uma regra udev para torná-los \n" + "acessíveis para não root." + ); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW))) + snprintf(s, len, + "Driver de entrada linuxraw. \n" + " \n" + "Este driver requer um TTY ativo. Eventos de \n" + "teclado são lidos diretamente do TTY o que \n" + "o torna simples, mas não tão flexível, \n" + "quanto udev. \n" + "Mouses, etc, não são suportados de nenhum \n" + "modo. \n" + " \n" + "Este driver utiliza a antiga API de Joystick \n" + "(/dev/input/js*)."); + else + snprintf(s, len, + "Driver de entrada.\n" + " \n" + "Dependendo do driver de vídeo, pode \n" + "forçar um driver de entrada diferente."); } break; case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: @@ -902,22 +897,17 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); + { + const char *lbl = settings ? settings->arrays.audio_resampler : NULL; - switch (driver_hash) { - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC: - snprintf(s, len, - "Implementação SINC windowed."); - break; - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC: - snprintf(s, len, - "Implementação Convoluted Cosine."); - break; - default: - if (string_is_empty(s)) - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); - break; + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC))) + strlcpy(s, + "Implementação SINC windowed.", len); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC))) + strlcpy(s, + "Implementação Convoluted Cosine.", len); + else if (string_is_empty(s)) + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); } break; case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: diff --git a/intl/msg_hash_pt_pt.c b/intl/msg_hash_pt_pt.c index bdff63fadd..7dfa930401 100644 --- a/intl/msg_hash_pt_pt.c +++ b/intl/msg_hash_pt_pt.c @@ -25,7 +25,6 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) { - uint32_t driver_hash = 0; settings_t *settings = config_get_ptr(); switch (msg) @@ -45,12 +44,10 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) "o arquivo estiver."); break; case MENU_ENUM_LABEL_INPUT_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.input_driver); - - switch (driver_hash) { - case MENU_LABEL_INPUT_DRIVER_UDEV: + const char *lbl = settings ? settings->arrays.input_driver : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_UDEV))) snprintf(s, len, "Driver de entrada udev. \n" " \n" @@ -69,8 +66,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) "/dev/input são root-only (modo 600). Mas você pode \n" "definir uma regra udev para dar acesso a non-roots." ); - break; - case MENU_LABEL_INPUT_DRIVER_LINUXRAW: + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW))) snprintf(s, len, "Driver de Entrada linuxraw. \n" " \n" @@ -80,14 +76,12 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) " \n" "Esse driver usa a antiga API de joysticks \n" "(/dev/input/js*)."); - break; - default: + else snprintf(s, len, "Driver de Entrada.\n" " \n" "Dependendo do driver de vídeo, pode ser necessário \n" "forçar um driver de entrada diferente."); - break; } break; case MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY: @@ -183,19 +177,15 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); - - switch (driver_hash) { - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC: - snprintf(s, len, - "Implementação Windowed SINC."); - break; - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC: - snprintf(s, len, - "Implementação Convoluted Cosine."); - break; + const char *lbl = settings ? settings->arrays.audio_resampler : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC))) + strlcpy(s, + "Implementação Windowed SINC.", len); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC))) + strlcpy(s, + "Implementação Convoluted Cosine.", len); } break; case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index a215541dc9..86de76a8cd 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -27,7 +27,6 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) { - uint32_t driver_hash = 0; settings_t *settings = config_get_ptr(); if (msg == MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM) @@ -711,45 +710,42 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_INPUT_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.input_driver); + { + const char *lbl = settings ? settings->arrays.input_driver : NULL; - switch (driver_hash) { - case MENU_LABEL_INPUT_DRIVER_UDEV: - snprintf(s, len, - "udev Input driver. \n" - " \n" - "It uses the recent evdev joypad API \n" - "for joystick support. It supports \n" - "hotplugging and force feedback. \n" - " \n" - "The driver reads evdev events for keyboard \n" - "support. It also supports keyboard callback, \n" - "mice and touchpads. \n" - " \n" - "By default in most distros, /dev/input nodes \n" - "are root-only (mode 600). You can set up a udev \n" - "rule which makes these accessible to non-root." - ); - break; - case MENU_LABEL_INPUT_DRIVER_LINUXRAW: - snprintf(s, len, - "linuxraw Input driver. \n" - " \n" - "This driver requires an active TTY. Keyboard \n" - "events are read directly from the TTY which \n" - "makes it simpler, but not as flexible as udev. \n" "Mice, etc, are not supported at all. \n" - " \n" - "This driver uses the older joystick API \n" - "(/dev/input/js*)."); - break; - default: - snprintf(s, len, - "Input driver.\n" - " \n" - "Depending on video driver, it might \n" - "force a different input driver."); - break; + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_UDEV))) + snprintf(s, len, + "udev Input driver. \n" + " \n" + "It uses the recent evdev joypad API \n" + "for joystick support. It supports \n" + "hotplugging and force feedback. \n" + " \n" + "The driver reads evdev events for keyboard \n" + "support. It also supports keyboard callback, \n" + "mice and touchpads. \n" + " \n" + "By default in most distros, /dev/input nodes \n" + "are root-only (mode 600). You can set up a udev \n" + "rule which makes these accessible to non-root." + ); + else if (string_is_equal(lbl, + msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW))) + snprintf(s, len, + "linuxraw Input driver. \n" + " \n" + "This driver requires an active TTY. Keyboard \n" + "events are read directly from the TTY which \n" + "makes it simpler, but not as flexible as udev. \n" "Mice, etc, are not supported at all. \n" + " \n" + "This driver uses the older joystick API \n" + "(/dev/input/js*)."); + else + snprintf(s, len, + "Input driver.\n" + " \n" + "Depending on video driver, it might \n" + "force a different input driver."); } break; case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: @@ -873,22 +869,19 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); + { + const char *lbl = settings ? settings->arrays.audio_resampler : NULL; - switch (driver_hash) { - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC: - snprintf(s, len, - "Windowed SINC implementation."); - break; - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC: - snprintf(s, len, - "Convoluted Cosine implementation."); - break; - default: - if (string_is_empty(s)) - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); - break; + if (string_is_equal(lbl, msg_hash_to_str( + MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC))) + strlcpy(s, + "Windowed SINC implementation.", len); + else if (string_is_equal(lbl, msg_hash_to_str( + MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC))) + strlcpy(s, + "Convoluted Cosine implementation.", len); + else if (string_is_empty(s)) + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); } break; case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index e7f6e46416..110a4c26e4 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -32,7 +32,6 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) { - uint32_t driver_hash = 0; settings_t *settings = config_get_ptr(); if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END && @@ -695,33 +694,30 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_INPUT_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.input_driver); - - switch (driver_hash) { - case MENU_LABEL_INPUT_DRIVER_UDEV: - snprintf(s, len, - "udev Input driver. \n" - " \n" - "This driver can run without X. \n" - " \n" - "It uses the recent evdev joypad API \n" - "for joystick support. It supports \n" - "hotplugging and force feedback (if \n" - "supported by device). \n" - " \n" - "The driver reads evdev events for keyboard \n" - "support. It also supports keyboard callback, \n" - "mice and touchpads. \n" - " \n" - "By default in most distros, /dev/input nodes \n" - "are root-only (mode 600). You can set up a udev \n" - "rule which makes these accessible to non-root." - ); - break; - case MENU_LABEL_INPUT_DRIVER_LINUXRAW: - snprintf(s, len, + const char *lbl = settings ? settings->arrays.input_driver : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_UDEV))) + snprintf(s, len, + "udev Input driver. \n" + " \n" + "This driver can run without X. \n" + " \n" + "It uses the recent evdev joypad API \n" + "for joystick support. It supports \n" + "hotplugging and force feedback (if \n" + "supported by device). \n" + " \n" + "The driver reads evdev events for keyboard \n" + "support. It also supports keyboard callback, \n" + "mice and touchpads. \n" + " \n" + "By default in most distros, /dev/input nodes \n" + "are root-only (mode 600). You can set up a udev \n" + "rule which makes these accessible to non-root." + ); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW))) + strlcpy(s, "linuxraw Input driver. \n" " \n" "This driver requires an active TTY. Keyboard \n" @@ -729,15 +725,13 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "makes it simpler, but not as flexible as udev. \n" "Mice, etc, are not supported at all. \n" " \n" "This driver uses the older joystick API \n" - "(/dev/input/js*)."); - break; - default: - snprintf(s, len, + "(/dev/input/js*).", len); + else + strlcpy(s, "Input driver.\n" " \n" "Depending on video driver, it might \n" - "force a different input driver."); - break; + "force a different input driver.", len); } break; case MENU_ENUM_LABEL_LOAD_CONTENT_LIST: @@ -861,23 +855,17 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) ); break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: - if (settings) - driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); - - switch (driver_hash) { - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC: - snprintf(s, len, - "Windowed SINC implementation."); - break; - case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC: - snprintf(s, len, - "Convoluted Cosine implementation."); - break; - default: - if (string_is_empty(s)) - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); - break; + const char *lbl = settings ? settings->arrays.audio_resampler : NULL; + + if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC))) + strlcpy(s, + "Windowed SINC implementation.", len); + else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC))) + strlcpy(s, + "Convoluted Cosine implementation.", len); + else if (string_is_empty(s)) + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); } break; case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: diff --git a/msg_hash.h b/msg_hash.h index 2d64443246..d873506e75 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1789,13 +1789,6 @@ enum msg_hash_enums #define MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST 0xb4f82700U #define MENU_LABEL_FAVORITES 0x67325138U -/* Help */ -#define MENU_LABEL_INPUT_DRIVER_LINUXRAW 0xc33c6b9fU -#define MENU_LABEL_INPUT_DRIVER_UDEV 0x7c9eeeb9U - -#define MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC 0x7c9dec52U -#define MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC 0x0059732bU - const char *msg_hash_to_str(enum msg_hash_enums msg); const char *msg_hash_to_str_fr(enum msg_hash_enums msg);