From 2a9bf91e0d8cbe62dc4d51155e64c674a502191f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 29 Jun 2016 02:40:05 +0200 Subject: [PATCH] Use MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE --- gfx/drivers_shader/shader_vulkan.cpp | 10 ++++++++-- gfx/video_driver.c | 2 +- input/input_config.c | 12 ++++++++---- intl/msg_hash_pt.c | 2 -- menu/cbs/menu_cbs_get_value.c | 5 +++-- menu/cbs/menu_cbs_title.c | 2 +- menu/menu_displaylist.c | 2 +- runloop.c | 3 ++- ui/drivers/cocoa/cocoatouch_menu.m | 8 ++++++-- 9 files changed, 30 insertions(+), 16 deletions(-) diff --git a/gfx/drivers_shader/shader_vulkan.cpp b/gfx/drivers_shader/shader_vulkan.cpp index b9d462a7d1..011f7598e0 100644 --- a/gfx/drivers_shader/shader_vulkan.cpp +++ b/gfx/drivers_shader/shader_vulkan.cpp @@ -21,9 +21,12 @@ #include #include #include + +#include "slang_reflection.hpp" + #include "../video_shader_driver.h" #include "../../verbosity.h" -#include "slang_reflection.hpp" +#include "../../msg_hash.h" using namespace std; @@ -804,7 +807,10 @@ bool vulkan_filter_chain::init() for (unsigned i = 0; i < passes.size(); i++) { auto &pass = passes[i]; - RARCH_LOG("[slang]: Building pass #%u (%s)\n", i, pass->get_name().empty() ? "N/A" : pass->get_name().c_str()); + RARCH_LOG("[slang]: Building pass #%u (%s)\n", i, + pass->get_name().empty() ? + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE) : + pass->get_name().c_str()); source = pass->set_pass_info(max_input_size, source, swapchain_info, pass_info[i]); diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 6aa19960e6..10f0257aea 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -1029,7 +1029,7 @@ bool video_monitor_get_fps(char *buf, size_t size, curr_time = fps_time = new_time; strlcpy(buf, video_driver_title_buf, size); if (buf_fps) - strlcpy(buf_fps, "N/A", size_fps); + strlcpy(buf_fps, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), size_fps); return true; } diff --git a/input/input_config.c b/input/input_config.c index add1f00ad6..8e3bda95a3 100644 --- a/input/input_config.c +++ b/input/input_config.c @@ -25,6 +25,7 @@ #include "input_keymaps.h" #include "input_remapping.h" +#include "../msg_hash.h" #include "../file_path_special.h" #include "../general.h" #include "../verbosity.h" @@ -390,8 +391,9 @@ static void input_config_get_bind_string_joykey(char *buf, const char *prefix, && settings->input.input_descriptor_label_show) snprintf(buf, size, "%s %s ", prefix, bind->joykey_label); else - snprintf(buf, size, "%sHat #%u %s (N/A)", prefix, - (unsigned)GET_HAT(bind->joykey), dir); + snprintf(buf, size, "%sHat #%u %s (%s)", prefix, + (unsigned)GET_HAT(bind->joykey), dir, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE)); } else { @@ -399,7 +401,8 @@ static void input_config_get_bind_string_joykey(char *buf, const char *prefix, && settings->input.input_descriptor_label_show) snprintf(buf, size, "%s%s (btn) ", prefix, bind->joykey_label); else - snprintf(buf, size, "%s%u (N/A) ", prefix, (unsigned)bind->joykey); + snprintf(buf, size, "%s%u (%s) ", prefix, (unsigned)bind->joykey, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE)); } } @@ -424,7 +427,8 @@ static void input_config_get_bind_string_joyaxis(char *buf, const char *prefix, && settings->input.input_descriptor_label_show) snprintf(buf, size, "%s%s (axis) ", prefix, bind->joyaxis_label); else - snprintf(buf, size, "%s%c%u (N/A) ", prefix, dir, axis); + snprintf(buf, size, "%s%c%u (%s) ", prefix, dir, axis, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE)); } void input_config_get_bind_string(char *buf, const struct retro_keybind *bind, diff --git a/intl/msg_hash_pt.c b/intl/msg_hash_pt.c index 852274df84..0f3d4c4a71 100644 --- a/intl/msg_hash_pt.c +++ b/intl/msg_hash_pt.c @@ -1214,8 +1214,6 @@ const char *msg_hash_to_str_pt(enum msg_hash_enums msg) return ""; case MENU_ENUM_LABEL_VALUE_DIRECTORY_NONE: return ""; - case MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE: - return "N/A"; case MENU_ENUM_LABEL_VALUE_INPUT_REMAPPING_DIRECTORY: return "Remapeamentos de Controladores"; case MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR: diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 3d3062bb4c..a43b97e7fd 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -440,7 +440,8 @@ static void menu_action_setting_disp_set_label_input_desc( if (inp_desc_button_index_offset < RARCH_FIRST_CUSTOM_BIND) { - if(strstr(descriptor,"Auto") && !strstr(descriptor,"(N/A)")) + if(strstr(descriptor,"Auto") && !strstr(descriptor, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE))) strlcpy(s, descriptor, len); @@ -1222,7 +1223,7 @@ static void menu_action_setting_disp_set_label_playlist_associations(file_list_t string_list_free(str_list2); if (string_is_equal(s, "DETECT") || !found_matching_core_association) - strlcpy(s, "N/A", len); + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len); else { char buf[PATH_MAX_LENGTH]; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index f536e8cb35..e29b368b41 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -554,7 +554,7 @@ static int action_get_title_generic(char *s, size_t len, const char *path, (string_is_empty(elem0_path)) ? "" : path_basename(elem0_path)); } else - strlcpy(s, "N/A", len); + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len); return 0; } diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 8ae31047eb..802fb4fd40 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -716,7 +716,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info) break; case FRONTEND_ARCH_NONE: default: - strlcpy(cpu_arch_str, "N/A", sizeof(cpu_arch_str)); + strlcpy(cpu_arch_str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), sizeof(cpu_arch_str)); break; } diff --git a/runloop.c b/runloop.c index 71044ceda4..383c4d3b65 100644 --- a/runloop.c +++ b/runloop.c @@ -1104,7 +1104,8 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) RARCH_LOG("Environ GET_VARIABLE %s:\n", var->key); core_option_manager_get(runloop_core_options, var); - RARCH_LOG("\t%s\n", var->value ? var->value : "N/A"); + RARCH_LOG("\t%s\n", var->value ? var->value : + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE)); } break; case RUNLOOP_CTL_CORE_OPTIONS_INIT: diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m index 857dbeeb64..587c97849f 100644 --- a/ui/drivers/cocoa/cocoatouch_menu.m +++ b/ui/drivers/cocoa/cocoatouch_menu.m @@ -126,7 +126,9 @@ static void RunActionSheet(const char* title, const struct string_list* items, result.textLabel.text = BOXSTRING(label); if (string_is_empty(label)) - strlcpy(buffer, "N/A", sizeof(buffer)); + strlcpy(buffer, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), + sizeof(buffer)); result.detailTextLabel.text = BOXSTRING(buffer); return result; } @@ -429,7 +431,9 @@ replacementString:(NSString *)string menu_entry_get_value(self.i, buffer, sizeof(buffer)); if (string_is_empty(buffer)) - strlcpy(buffer, "N/A", sizeof(buffer)); + strlcpy(buffer, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), + sizeof(buffer)); field.placeholder = BOXSTRING(buffer);