From 0d568f4c653d4300a9b19cb055e9d5eac2d0a6c5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 28 Jun 2015 16:52:11 +0200 Subject: [PATCH] Rename 'Media Player Settings' to 'Multimedia Settings' --- menu/intl/menu_hash_de.c | 4 ++-- menu/intl/menu_hash_fr.c | 4 ++-- menu/intl/menu_hash_nl.c | 4 ++-- menu/intl/menu_hash_pt.c | 4 ++-- menu/intl/menu_hash_us.c | 4 ++-- menu/menu_hash.h | 2 +- menu/menu_setting.c | 8 ++++---- menu/menu_setting.h | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/menu/intl/menu_hash_de.c b/menu/intl/menu_hash_de.c index e1405bef40..b081997fda 100644 --- a/menu/intl/menu_hash_de.c +++ b/menu/intl/menu_hash_de.c @@ -793,8 +793,8 @@ const char *menu_hash_to_str_de(uint32_t hash) return "Overlay-Einstellungen"; case MENU_LABEL_VALUE_MENU_SETTINGS: return "Menü-Einstellungen"; - case MENU_LABEL_VALUE_MEDIA_PLAYER_SETTINGS: - return "Media-Player-Einstellungen"; + case MENU_LABEL_VALUE_MULTIMEDIA_SETTINGS: + return "Media-Player-Einstellungen"; /* UPDATE/FIXME */ case MENU_LABEL_VALUE_UI_SETTINGS: return "Benutzeroberflächen-Einstellungen"; case MENU_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS: diff --git a/menu/intl/menu_hash_fr.c b/menu/intl/menu_hash_fr.c index a84ccbd141..1181762b47 100644 --- a/menu/intl/menu_hash_fr.c +++ b/menu/intl/menu_hash_fr.c @@ -782,8 +782,8 @@ const char *menu_hash_to_str_fr(uint32_t hash) return "Réglages d'overlays"; case MENU_LABEL_VALUE_MENU_SETTINGS: return "Réglages du menu"; - case MENU_LABEL_VALUE_MEDIA_PLAYER_SETTINGS: - return "Réglages du lecteur multimédia"; + case MENU_LABEL_VALUE_MULTIMEDIA_SETTINGS: + return "Réglages du lecteur multimédia"; /* FIXME/UPDATE */ case MENU_LABEL_VALUE_UI_SETTINGS: return "Réglages interface graphique"; case MENU_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS: diff --git a/menu/intl/menu_hash_nl.c b/menu/intl/menu_hash_nl.c index 431a32b2d1..75776396b8 100644 --- a/menu/intl/menu_hash_nl.c +++ b/menu/intl/menu_hash_nl.c @@ -781,8 +781,8 @@ const char *menu_hash_to_str_nl(uint32_t hash) return "Onscreen Overlay Instellingen"; case MENU_LABEL_VALUE_MENU_SETTINGS: return "Menu Instellingen"; - case MENU_LABEL_VALUE_MEDIA_PLAYER_SETTINGS: - return "Media Speler Instellingen"; + case MENU_LABEL_VALUE_MULTIMEDIA_SETTINGS: + return "Multimedia Instellingen"; case MENU_LABEL_VALUE_UI_SETTINGS: return "Gebruikersinterface Instellingen"; case MENU_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS: diff --git a/menu/intl/menu_hash_pt.c b/menu/intl/menu_hash_pt.c index 943e14bb50..09cac2941b 100644 --- a/menu/intl/menu_hash_pt.c +++ b/menu/intl/menu_hash_pt.c @@ -789,8 +789,8 @@ const char *menu_hash_to_str_pt(uint32_t hash) return "Definições de Overlay em Tela"; case MENU_LABEL_VALUE_MENU_SETTINGS: return "Definições de Menu"; - case MENU_LABEL_VALUE_MEDIA_PLAYER_SETTINGS: - return "Definições de Reprodução de Mídia"; + case MENU_LABEL_VALUE_MULTIMEDIA_SETTINGS: + return "Definições de Reprodução de Mídia"; /* UPDATE/FIXME */ case MENU_LABEL_VALUE_UI_SETTINGS: return "Definições de Interface de Usuário"; case MENU_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS: diff --git a/menu/intl/menu_hash_us.c b/menu/intl/menu_hash_us.c index 67bc3507d6..c5d22be986 100644 --- a/menu/intl/menu_hash_us.c +++ b/menu/intl/menu_hash_us.c @@ -1346,8 +1346,8 @@ const char *menu_hash_to_str_us(uint32_t hash) return "Onscreen Overlay Settings"; case MENU_LABEL_VALUE_MENU_SETTINGS: return "Menu Settings"; - case MENU_LABEL_VALUE_MEDIA_PLAYER_SETTINGS: - return "Media Player Settings"; + case MENU_LABEL_VALUE_MULTIMEDIA_SETTINGS: + return "Multimedia Settings"; case MENU_LABEL_VALUE_UI_SETTINGS: return "User Interface Settings"; case MENU_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 5034016143..fd80ca4a95 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -736,7 +736,7 @@ extern "C" { #define MENU_LABEL_OVERLAY_SETTINGS 0x997b2fd5U #define MENU_LABEL_VALUE_OVERLAY_SETTINGS 0x997b2fd5U #define MENU_LABEL_ONSCREEN_KEYBOARD_OVERLAY_SETTINGS 0xa6de9ba6U -#define MENU_LABEL_VALUE_MEDIA_PLAYER_SETTINGS 0x77d23103U +#define MENU_LABEL_VALUE_MULTIMEDIA_SETTINGS 0x77d23103U #define MENU_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS 0x652cf7efU #define MENU_LABEL_MENU_SETTINGS 0x61e4544bU #define MENU_LABEL_VALUE_MENU_SETTINGS 0x61e4544bU diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 761fc29376..baaff9d954 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -4843,7 +4843,7 @@ static bool setting_append_list_menu_options( return true; } -static bool setting_append_list_mediaplayer_options( +static bool setting_append_list_multimedia_options( rarch_setting_t **list, rarch_setting_info_t *list_info, const char *parent_group) @@ -4853,7 +4853,7 @@ static bool setting_append_list_mediaplayer_options( settings_t *settings = config_get_ptr(); START_GROUP(group_info, - menu_hash_to_str(MENU_LABEL_VALUE_MEDIA_PLAYER_SETTINGS), + menu_hash_to_str(MENU_LABEL_VALUE_MULTIMEDIA_SETTINGS), parent_group); parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); @@ -6185,9 +6185,9 @@ rarch_setting_t *menu_setting_new(unsigned mask) goto error; } - if (mask & SL_FLAG_MEDIA_PLAYER_OPTIONS) + if (mask & SL_FLAG_MULTIMEDIA_OPTIONS) { - if (!setting_append_list_mediaplayer_options(&list, list_info, root)) + if (!setting_append_list_multimedia_options(&list, list_info, root)) goto error; } diff --git a/menu/menu_setting.h b/menu/menu_setting.h index e0486114ed..e0957c9ecf 100644 --- a/menu/menu_setting.h +++ b/menu/menu_setting.h @@ -82,7 +82,7 @@ enum setting_list_flags SL_FLAG_INPUT_HOTKEY_OPTIONS = (1 << 11), SL_FLAG_OVERLAY_OPTIONS = (1 << 12), SL_FLAG_MENU_OPTIONS = (1 << 13), - SL_FLAG_MEDIA_PLAYER_OPTIONS = (1 << 14), + SL_FLAG_MULTIMEDIA_OPTIONS = (1 << 14), SL_FLAG_UI_OPTIONS = (1 << 15), SL_FLAG_CORE_UPDATER_OPTIONS = (1 << 16), SL_FLAG_NETPLAY_OPTIONS = (1 << 17),