From 550704049429f91d99fb6d544173f1a8dc9723fb Mon Sep 17 00:00:00 2001 From: BPanther Date: Sun, 26 Jan 2020 22:31:45 +0100 Subject: [PATCH] arm/mips: new video setting zapping mode added Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/84fbb0c6c6a2d31bbfe199795e9dc468f977b66c Author: BPanther Date: 2020-01-26 (Sun, 26 Jan 2020) --- data/locale/deutsch.locale | 5 +++++ data/locale/english.locale | 5 +++++ src/gui/videosettings.cpp | 33 ++++++++++++++++++++++++++++----- src/neutrino.cpp | 13 +++++++++++++ src/system/locals.h | 5 +++++ src/system/locals_intern.h | 5 +++++ src/system/settings.h | 3 +++ 7 files changed, 64 insertions(+), 5 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 6c22fecac..1b6a8cd84 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -2917,6 +2917,11 @@ videomenu.videoformat_149 14:9 videomenu.videoformat_169 16:9 videomenu.videoformat_43 4:3 videomenu.videomode Videosystem +videomenu.zappingmode Umschaltmodus +videomenu.zappingmode_mute schwarzes Bild +videomenu.zappingmode_hold Standbild +videomenu.zappingmode_mutetilllock schwarzes Bild bis lock +videomenu.zappingmode_holdtilllock Standbild bis lock weather.api_key Wetter API Schlüssel (Dark Sky) weather.enabled Wetter-Unterstützung weather.location Wetter-Standort diff --git a/data/locale/english.locale b/data/locale/english.locale index 3c27ce2b0..ecbb494b8 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -2917,6 +2917,11 @@ videomenu.videoformat_149 14:9 videomenu.videoformat_169 16:9 videomenu.videoformat_43 4:3 videomenu.videomode Digital video mode +videomenu.zappingmode Zap mode +videomenu.zappingmode_mute black screen +videomenu.zappingmode_hold hold screen +videomenu.zappingmode_mutetilllock black screen till locked +videomenu.zappingmode_holdtilllock hold screen till locked weather.api_key Weather API key (Dark Sky) weather.enabled Weather support weather.location Weather location diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index ab058e309..988fe397e 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -222,7 +222,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { -1, NONEXISTANT_LOCALE, "720p 60Hz" }, { -1, NONEXISTANT_LOCALE, "1080i 60Hz" }, { -1, NONEXISTANT_LOCALE, "1080p 50Hz" }, - { -1, NONEXISTANT_LOCALE, "Auto" } + { -1, NONEXISTANT_LOCALE, "Auto" } }; #elif HAVE_COOL_HARDWARE /* numbers corresponding to video.cpp from zapit */ @@ -250,7 +250,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { VIDEO_STD_1080P2397, NONEXISTANT_LOCALE, "1080p 23.97Hz"}, { VIDEO_STD_1080P2997, NONEXISTANT_LOCALE, "1080p 29.97Hz"}, #endif - { VIDEO_STD_AUTO, NONEXISTANT_LOCALE, "Auto" } + { VIDEO_STD_AUTO, NONEXISTANT_LOCALE, "Auto" } }; #elif HAVE_SPARK_HARDWARE || HAVE_AZBOX_HARDWARE CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] = @@ -267,7 +267,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" }, { VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" }, { VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz" }, - { -1, NONEXISTANT_LOCALE, "Auto" } + { -1, NONEXISTANT_LOCALE, "Auto" } }; #elif HAVE_ARM_HARDWARE CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] = @@ -288,7 +288,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { VIDEO_STD_2160P25, NONEXISTANT_LOCALE, "2160p 25Hz" }, { VIDEO_STD_2160P30, NONEXISTANT_LOCALE, "2160p 30Hz" }, { VIDEO_STD_2160P50, NONEXISTANT_LOCALE, "2160p 50Hz" }, - { -1, NONEXISTANT_LOCALE, "Auto" } + { -1, NONEXISTANT_LOCALE, "Auto" } }; #else @@ -307,7 +307,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { -1, NONEXISTANT_LOCALE, "720p 60Hz" }, { -1, NONEXISTANT_LOCALE, "1080i 60Hz" }, { -1, NONEXISTANT_LOCALE, "1080p 50Hz" }, - { -1, NONEXISTANT_LOCALE, "Auto" } + { -1, NONEXISTANT_LOCALE, "Auto" } }; #endif @@ -327,6 +327,17 @@ const CMenuOptionChooser::keyval VIDEOMENU_DBDR_OPTIONS[VIDEOMENU_DBDR_OPTION_CO { 2, LOCALE_VIDEOMENU_DBDR_BOTH } }; +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE +#define VIDEOMENU_ZAPPINGMODE_OPTION_COUNT 4 +CMenuOptionChooser::keyval VIDEOMENU_ZAPPINGMODE_OPTIONS[VIDEOMENU_ZAPPINGMODE_OPTION_COUNT] = +{ + { 0, LOCALE_VIDEOMENU_ZAPPINGMODE_MUTE }, + { 1, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD }, + { 2, LOCALE_VIDEOMENU_ZAPPINGMODE_MUTETILLLOCK }, + { 3, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLDTILLLOCK } +}; +#endif + int CVideoSettings::showVideoSetup() { //init @@ -478,6 +489,12 @@ int CVideoSettings::showVideoSetup() pipsetup->setHint("", LOCALE_MENU_HINT_VIDEO_PIP); videosetup->addItem(pipsetup); #endif + +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE + CMenuOptionChooser * zm = new CMenuOptionChooser(LOCALE_VIDEOMENU_ZAPPINGMODE, &g_settings.zappingmode, VIDEOMENU_ZAPPINGMODE_OPTIONS, VIDEOMENU_ZAPPINGMODE_OPTION_COUNT, true, this); + videosetup->addItem(zm); +#endif + int res = videosetup->exec(NULL, ""); selected = videosetup->getSelected(); delete videosetup; @@ -627,6 +644,12 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /* videoDecoder->SetControl(VIDEO_CONTROL_HUE, val); } #endif + +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE + else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_ZAPPINGMODE)) { + videoDecoder->SetControl(VIDEO_CONTROL_ZAPPING_MODE, g_settings.zappingmode); + } +#endif return false; } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 4da06896f..3fb2396dc 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -463,6 +463,10 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.enabled_auto_modes[i] = configfile.getInt32(cfg_key, 1); } +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE + g_settings.zappingmode = configfile.getInt32( "zappingmode", 0); +#endif + #ifdef CPU_FREQ g_settings.cpufreq = configfile.getInt32("cpufreq", 0); g_settings.standby_cpufreq = configfile.getInt32("standby_cpufreq", 100); @@ -1481,6 +1485,11 @@ void CNeutrinoApp::saveSetup(const char * fname) sprintf(cfg_key, "enabled_auto_mode_%d", i); configfile.setInt32(cfg_key, g_settings.enabled_auto_modes[i]); } + +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE + configfile.setInt32( "zappingmode", g_settings.zappingmode); +#endif + configfile.setInt32( "cpufreq", g_settings.cpufreq); configfile.setInt32( "standby_cpufreq", g_settings.standby_cpufreq); @@ -2996,6 +3005,10 @@ TIMER_START(); CWeather::getInstance()->setCoords(g_settings.weather_location, g_settings.weather_city); +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE + videoDecoder->SetControl(VIDEO_CONTROL_ZAPPING_MODE, g_settings.zappingmode); +#endif + TIMER_STOP("################################## after all ##################################"); if (g_settings.softupdate_autocheck) { #if 0 diff --git a/src/system/locals.h b/src/system/locals.h index f7c3c91d1..9dcda6c48 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2944,6 +2944,11 @@ typedef enum LOCALE_VIDEOMENU_VIDEOFORMAT_169, LOCALE_VIDEOMENU_VIDEOFORMAT_43, LOCALE_VIDEOMENU_VIDEOMODE, + LOCALE_VIDEOMENU_ZAPPINGMODE, + LOCALE_VIDEOMENU_ZAPPINGMODE_MUTE, + LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD, + LOCALE_VIDEOMENU_ZAPPINGMODE_MUTETILLLOCK, + LOCALE_VIDEOMENU_ZAPPINGMODE_HOLDTILLLOCK, LOCALE_WEATHER_API_KEY, LOCALE_WEATHER_ENABLED, LOCALE_WEATHER_LOCATION, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 664fd351e..bb9b3e2ae 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2944,6 +2944,11 @@ const char * locale_real_names[] = "videomenu.videoformat_169", "videomenu.videoformat_43", "videomenu.videomode", + "videomenu.zappingmode", + "videomenu.zappingmode_mute", + "videomenu.zappingmode_hold", + "videomenu.zappingmode_mutetilllock", + "videomenu.zappingmode_holdtilllock", "weather.api_key", "weather.enabled", "weather.location", diff --git a/src/system/settings.h b/src/system/settings.h index a07f18679..8bc36872a 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -222,6 +222,9 @@ struct SNeutrinoSettings int record_safety_time_before; int record_safety_time_after; int zapto_pre_time; +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE + int zappingmode; +#endif int infobar_sat_display; int infobar_show_channeldesc; int infobar_subchan_disp_pos;