From 3e8bdba8b3ef7dc2df7acb21b04ce36dccf6bd7d Mon Sep 17 00:00:00 2001 From: TangoCash Date: Mon, 6 Dec 2021 19:24:17 +0100 Subject: [PATCH] rename hdmi_mode -> hdmi_colorimetry --- data/locale/deutsch.locale | 12 ++++++------ data/locale/english.locale | 12 ++++++------ src/gui/videosettings.cpp | 20 ++++++++++---------- src/neutrino.cpp | 6 +++--- src/system/locals.h | 12 ++++++------ src/system/locals_intern.h | 12 ++++++------ src/system/settings.h | 2 +- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 2f04d52aa..2d691387b 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1766,7 +1766,7 @@ menu.hint_video_cinch_mode Wählen Sie den Modus des Ausgangssignals für den Co menu.hint_video_contrast Ändert den Kontrast menu.hint_video_dbdr Verwendeter MPEG2 Filter menu.hint_video_format Wählen Sie das Bildschirmformat ihres Fernsehgerätes -menu.hint_video_hdmi_mode Wählt das Farbprofil für die HDMI Ausgabe +menu.hint_video_hdmi_colorimetry Wählt das Farbprofil für die HDMI Ausgabe menu.hint_video_mode Wählen Sie den Modus des Ausgangssignals für den HDMI-Anschluss menu.hint_video_modes Definiert, welche Videosysteme mit der VF-Taste der Fernbedienung ausgewählt werden können menu.hint_video_modes_auto Definiert, welche Videosysteme automatisch ausgewählt werden können @@ -2847,11 +2847,11 @@ videomenu.hdmi_cec_volume CEC Lautstärke Regelung videomenu.hdmi_cec_vol_audiosystem Audiosystem videomenu.hdmi_cec_vol_off aus videomenu.hdmi_cec_vol_tv TV -videomenu.hdmi_mode Farbprofil -videomenu.hdmi_mode_auto auto -videomenu.hdmi_mode_bt2020ncl BT 2020 ncl -videomenu.hdmi_mode_bt2020cl BT 2020 cl -videomenu.hdmi_mode_bt709 BT 709 +videomenu.hdmi_colorimetry Farbprofil +videomenu.hdmi_colorimetry_auto auto +videomenu.hdmi_colorimetry_bt2020ncl BT 2020 ncl +videomenu.hdmi_colorimetry_bt2020cl BT 2020 cl +videomenu.hdmi_colorimetry_bt709 BT 709 videomenu.hue Farbton videomenu.letterbox Letterbox videomenu.panscan Pan & Scan diff --git a/data/locale/english.locale b/data/locale/english.locale index 8140421c4..9bf8ab361 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1766,7 +1766,7 @@ menu.hint_video_cinch_mode Select analog output mode for\ncomposite video out menu.hint_video_contrast Change picture contrast menu.hint_video_dbdr MPEG2 enhancement filters menu.hint_video_format TV aspect ratio -menu.hint_video_hdmi_mode Selects the color profile for HDMI output +menu.hint_video_hdmi_colorimetry Selects the color profile for HDMI output menu.hint_video_mode HDMI output video mode menu.hint_video_modes VF key will cycle between enabled modes menu.hint_video_modes_auto Enable modes to auto-select based on content @@ -2847,11 +2847,11 @@ videomenu.hdmi_cec_volume CEC volume control videomenu.hdmi_cec_vol_audiosystem Audiosystem videomenu.hdmi_cec_vol_off off videomenu.hdmi_cec_vol_tv TV -videomenu.hdmi_mode Color profile -videomenu.hdmi_mode_auto auto -videomenu.hdmi_mode_bt2020ncl BT 2020 NCL -videomenu.hdmi_mode_bt2020cl BT 2020 CL -videomenu.hdmi_mode_bt709 BT 709 +videomenu.hdmi_colorimetry Color profile +videomenu.hdmi_colorimetry_auto auto +videomenu.hdmi_colorimetry_bt2020ncl BT 2020 NCL +videomenu.hdmi_colorimetry_bt2020cl BT 2020 CL +videomenu.hdmi_colorimetry_bt709 BT 709 videomenu.hue Hue videomenu.letterbox Letterbox videomenu.panscan Pan & Scan diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 93f20e22d..1c3061b07 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -363,13 +363,13 @@ CMenuOptionChooser::keyval VIDEOMENU_ZAPPINGMODE_OPTIONS[VIDEOMENU_ZAPPINGMODE_O { 1, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD } }; -#define VIDEOMENU_HDMI_MODE_OPTION_COUNT 4 -const CMenuOptionChooser::keyval VIDEOMENU_HDMI_MODE_OPTIONS[VIDEOMENU_HDMI_MODE_OPTION_COUNT] = +#define VIDEOMENU_HDMI_COLORIMETRY_OPTION_COUNT 4 +const CMenuOptionChooser::keyval VIDEOMENU_HDMI_COLORIMETRY_OPTIONS[VIDEOMENU_HDMI_COLORIMETRY_OPTION_COUNT] = { - { HDMI_MODE_AUTO, LOCALE_VIDEOMENU_HDMI_MODE_AUTO }, - { HDMI_MODE_BT2020NCL, LOCALE_VIDEOMENU_HDMI_MODE_BT2020NCL }, - { HDMI_MODE_BT2020CL, LOCALE_VIDEOMENU_HDMI_MODE_BT2020CL }, - { HDMI_MODE_BT709, LOCALE_VIDEOMENU_HDMI_MODE_BT709 } + { HDMI_COLORIMETRY_AUTO, LOCALE_VIDEOMENU_HDMI_COLORIMETRY_AUTO }, + { HDMI_COLORIMETRY_BT2020NCL, LOCALE_VIDEOMENU_HDMI_COLORIMETRY_BT2020NCL }, + { HDMI_COLORIMETRY_BT2020CL, LOCALE_VIDEOMENU_HDMI_COLORIMETRY_BT2020CL }, + { HDMI_COLORIMETRY_BT709, LOCALE_VIDEOMENU_HDMI_COLORIMETRY_BT709 } }; #endif @@ -542,8 +542,8 @@ int CVideoSettings::showVideoSetup() if (file_exists("/proc/stb/video/hdmi_colorimetry")) { - CMenuOptionChooser *hm = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_MODE, &g_settings.hdmimode, VIDEOMENU_HDMI_MODE_OPTIONS, VIDEOMENU_HDMI_MODE_OPTION_COUNT, true, this); - hm->setHint("", LOCALE_MENU_HINT_VIDEO_HDMI_MODE); + CMenuOptionChooser *hm = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_COLORIMETRY, &g_settings.hdmi_colorimetry, VIDEOMENU_HDMI_COLORIMETRY_OPTIONS, VIDEOMENU_HDMI_COLORIMETRY_OPTION_COUNT, true, this); + hm->setHint("", LOCALE_MENU_HINT_VIDEO_HDMI_COLORIMETRY); videosetup->addItem(hm); } @@ -742,9 +742,9 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /* { videoDecoder->SetControl(VIDEO_CONTROL_ZAPPING_MODE, g_settings.zappingmode); } - else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_MODE)) + else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_COLORIMETRY)) { - videoDecoder->SetHdmiMode((HDMI_MODE) g_settings.hdmimode); + videoDecoder->SetHDMIColorimetry((HDMI_COLORIMETRY) g_settings.hdmi_colorimetry); } #endif return false; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index ae7d413bc..d5c8743e6 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -542,7 +542,7 @@ int CNeutrinoApp::loadSetup(const char *fname) #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE g_settings.zappingmode = configfile.getInt32("zappingmode", 0); - g_settings.hdmimode = configfile.getInt32("hdmimode", 0); + g_settings.hdmi_colorimetry = configfile.getInt32("hdmi_colorimetry", 0); #endif g_settings.cpufreq = g_info.hw_caps->can_cpufreq ? configfile.getInt32("cpufreq", 0) : 0; @@ -1701,7 +1701,7 @@ void CNeutrinoApp::saveSetup(const char *fname) #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE configfile.setInt32("zappingmode", g_settings.zappingmode); - configfile.setInt32("hdmimode", g_settings.hdmimode); + configfile.setInt32("hdmi_colorimetry", g_settings.hdmi_colorimetry); #endif configfile.setInt32("cpufreq", g_settings.cpufreq); @@ -3302,7 +3302,7 @@ TIMER_START(); #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE videoDecoder->SetControl(VIDEO_CONTROL_ZAPPING_MODE, g_settings.zappingmode); - videoDecoder->SetHdmiMode((HDMI_MODE) g_settings.hdmimode); + videoDecoder->SetHDMIColorimetry((HDMI_COLORIMETRY) g_settings.hdmi_colorimetry); #endif TIMER_STOP("################################## after all ##################################"); diff --git a/src/system/locals.h b/src/system/locals.h index 4a41dfdf9..6af55a8f4 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1793,7 +1793,7 @@ typedef enum LOCALE_MENU_HINT_VIDEO_CONTRAST, LOCALE_MENU_HINT_VIDEO_DBDR, LOCALE_MENU_HINT_VIDEO_FORMAT, - LOCALE_MENU_HINT_VIDEO_HDMI_MODE, + LOCALE_MENU_HINT_VIDEO_HDMI_COLORIMETRY, LOCALE_MENU_HINT_VIDEO_MODE, LOCALE_MENU_HINT_VIDEO_MODES, LOCALE_MENU_HINT_VIDEO_MODES_AUTO, @@ -2874,11 +2874,11 @@ typedef enum LOCALE_VIDEOMENU_HDMI_CEC_VOL_AUDIOSYSTEM, LOCALE_VIDEOMENU_HDMI_CEC_VOL_OFF, LOCALE_VIDEOMENU_HDMI_CEC_VOL_TV, - LOCALE_VIDEOMENU_HDMI_MODE, - LOCALE_VIDEOMENU_HDMI_MODE_AUTO, - LOCALE_VIDEOMENU_HDMI_MODE_BT2020NCL, - LOCALE_VIDEOMENU_HDMI_MODE_BT2020CL, - LOCALE_VIDEOMENU_HDMI_MODE_BT709, + LOCALE_VIDEOMENU_HDMI_COLORIMETRY, + LOCALE_VIDEOMENU_HDMI_COLORIMETRY_AUTO, + LOCALE_VIDEOMENU_HDMI_COLORIMETRY_BT2020NCL, + LOCALE_VIDEOMENU_HDMI_COLORIMETRY_BT2020CL, + LOCALE_VIDEOMENU_HDMI_COLORIMETRY_BT709, LOCALE_VIDEOMENU_HUE, LOCALE_VIDEOMENU_LETTERBOX, LOCALE_VIDEOMENU_PANSCAN, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index b3221fffb..692745552 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1793,7 +1793,7 @@ const char * locale_real_names[] = "menu.hint_video_contrast", "menu.hint_video_dbdr", "menu.hint_video_format", - "menu.hint_video_hdmi_mode", + "menu.hint_video_hdmi_colorimetry", "menu.hint_video_mode", "menu.hint_video_modes", "menu.hint_video_modes_auto", @@ -2874,11 +2874,11 @@ const char * locale_real_names[] = "videomenu.hdmi_cec_vol_audiosystem", "videomenu.hdmi_cec_vol_off", "videomenu.hdmi_cec_vol_tv", - "videomenu.hdmi_mode", - "videomenu.hdmi_mode_auto", - "videomenu.hdmi_mode_bt2020ncl", - "videomenu.hdmi_mode_bt2020cl", - "videomenu.hdmi_mode_bt709", + "videomenu.hdmi_colorimetry", + "videomenu.hdmi_colorimetry_auto", + "videomenu.hdmi_colorimetry_bt2020ncl", + "videomenu.hdmi_colorimetry_bt2020cl", + "videomenu.hdmi_colorimetry_bt709", "videomenu.hue", "videomenu.letterbox", "videomenu.panscan", diff --git a/src/system/settings.h b/src/system/settings.h index 5b3ffbd78..ddc574d7f 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -387,7 +387,7 @@ struct SNeutrinoSettings #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE int zappingmode; - int hdmimode; + int hdmi_colorimetry; #endif int cpufreq;