Revert "webtv: add prefered quality option for use in webtv plugins"; ...

re-activate g_settings.livestreamResolution


Origin commit data
------------------
Branch: ni/coolstream
Commit: a56c04ca97
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-09-20 (Mon, 20 Sep 2021)

Origin message was:
------------------
- Revert "webtv: add prefered quality option for use in webtv plugins"; ...

re-activate g_settings.livestreamResolution


------------------
This commit was generated by Migit

data/locale/deutsch.locale

@@ -3040,7 +3040,6 @@ webradio.xml.auto WebRadio-Dateien automatisch laden
 webtv.head WebTV
 webtv.xml WebTV-Dateien
 webtv.xml.auto WebTV-Dateien automatisch laden
-webtv.xml.pref_quality Bevorzugte Qualität
 window_size Fenstergröße in %
 wizard.initial_settings Grundeinstellungen gefunden
 wizard.install_settings Kanalliste für Astra 19.2°E installieren?

data/locale/english.locale

@@ -3040,7 +3040,6 @@ webradio.xml.auto Auto-load WebRadio files
 webtv.head WebTV
 webtv.xml WebTV files
 webtv.xml.auto Auto-load WebTV files
-webtv.xml.pref_quality Prefered quality
 window_size Window size in %
 wizard.initial_settings Initial settings found
 wizard.install_settings Do you want to install channels for Astra 19.2°E?

src/gui/webchannels_setup.cpp

@@ -58,20 +58,6 @@ static const struct button_label CWebChannelsSetupFooterButtons[] =
 };
 #define CWebChannelsSetupFooterButtonCount (sizeof(CWebChannelsSetupFooterButtons)/sizeof(CWebChannelsSetupFooterButtons[0]))
 
-CMenuOptionChooser::keyval_ext WEBTV_XML_QUALITY_OPTIONS[] =
-{
-#if !HAVE_CST_HARDWARE
-	{ 3840, NONEXISTANT_LOCALE, "3840x2160"	 },
-	{ 2560, NONEXISTANT_LOCALE, "2560x1440"	 },
-#endif
-	{ 1920, NONEXISTANT_LOCALE, "1920x1080"	 },
-	{ 1280, NONEXISTANT_LOCALE, "1280x720"	 },
-	{ 854,  NONEXISTANT_LOCALE, "854x480"	 },
-	{ 640,  NONEXISTANT_LOCALE, "640x360"	 },
-	{ 480,  NONEXISTANT_LOCALE, "480x270"	 }
-};
-#define WEBTV_XML_QUALITY_OPTION_COUNT (sizeof(WEBTV_XML_QUALITY_OPTIONS)/sizeof(CMenuOptionChooser::keyval_ext))
-
 int CWebChannelsSetup::exec(CMenuTarget *parent, const std::string &actionKey)
 {
 	int res = menu_return::RETURN_REPAINT;
@@ -213,26 +199,14 @@ int CWebChannelsSetup::Show()
 
 	int shortcut = 1;
 
-#if 0
-	bool _mode_webtv = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv) &&
-			   (!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty());
-
-	bool _mode_webradio = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio) &&
-			   (!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty());
-
 	CMenuForwarder *mf;
-	mf = new CMenuForwarder(LOCALE_LIVESTREAM_SCRIPTPATH, !_mode_webtv || !_mode_webradio, g_settings.livestreamScriptPath, this, "script_path", CRCInput::convertDigitToKey(shortcut++));
-	m->addItem(mf);
-	mf = new CMenuForwarder(LOCALE_LIVESTREAM_RESOLUTION, _mode_webtv, NULL, new CWebTVResolution(), NULL, CRCInput::convertDigitToKey(shortcut++));
-	m->addItem(mf);
-
-	m->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, webradio ? LOCALE_WEBRADIO_XML : LOCALE_WEBTV_XML));
-#endif
 
 	if (!webradio)
 	{
-		m->addItem(new CMenuOptionChooser(LOCALE_WEBTV_XML_PREF_QUALITY, &g_settings.webtv_xml_quality, WEBTV_XML_QUALITY_OPTIONS, WEBTV_XML_QUALITY_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++), "", true));
+		mf = new CMenuForwarder(LOCALE_LIVESTREAM_RESOLUTION, true, NULL, new CWebTVResolution(), NULL, CRCInput::convertDigitToKey(shortcut++));
-		m->addItem(GenericMenuSeparatorLine);
+		m->addItem(mf);
+
+		m->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, webradio ? LOCALE_WEBRADIO_XML : LOCALE_WEBTV_XML));
 	}
 
 	// TODO: show/hide autoloaded content when switching g_settings.webradio/webtv_xml_auto
@@ -453,12 +427,15 @@ CWebTVResolution::CWebTVResolution()
 
 const CMenuOptionChooser::keyval_ext LIVESTREAM_RESOLUTION_OPTIONS[] =
 {
+#if !HAVE_CST_HARDWARE
+	{ 3840, NONEXISTANT_LOCALE, "3840x2160" },
+	{ 2560, NONEXISTANT_LOCALE, "2560x1440" },
+#endif
 	{ 1920, NONEXISTANT_LOCALE, "1920x1080" },
 	{ 1280, NONEXISTANT_LOCALE, "1280x720"  },
 	{ 854,  NONEXISTANT_LOCALE, "854x480"   },
 	{ 640,  NONEXISTANT_LOCALE, "640x360"   },
-	{ 426,  NONEXISTANT_LOCALE, "426x240"   },
+	{ 480,  NONEXISTANT_LOCALE, "480x270"   }
-	{ 128,  NONEXISTANT_LOCALE, "128x72"    }
 };
 #define LIVESTREAM_RESOLUTION_OPTION_COUNT (sizeof(LIVESTREAM_RESOLUTION_OPTIONS)/sizeof(CMenuOptionChooser::keyval_ext))
 

src/neutrino.cpp

@@ -896,7 +896,6 @@ int CNeutrinoApp::loadSetup(const char *fname)
 	g_settings.widget_fade = configfile.getBool("widget_fade", false);
 
 	// webtv
-	g_settings.webtv_xml_quality = configfile.getInt32("webtv_xml_quality", 1280);
 	g_settings.webtv_xml_auto = configfile.getInt32("webtv_xml_auto", 1);
 	g_settings.webtv_xml.clear();
 	int webtv_count = configfile.getInt32("webtv_xml_count", 0);
@@ -1991,7 +1990,6 @@ void CNeutrinoApp::saveSetup(const char *fname)
 
 	// webtv
 	CWebChannelsSetup webchannelssetup;
-	configfile.setInt32("webtv_xml_quality", g_settings.webtv_xml_quality);
 	configfile.setInt32("webtv_xml_auto", g_settings.webtv_xml_auto);
 	int webtv_count = 0;
 	for (std::list<std::string>::iterator it = g_settings.webtv_xml.begin(); it != g_settings.webtv_xml.end(); ++it)

src/system/locals.h

@@ -3067,7 +3067,6 @@ typedef enum
 	LOCALE_WEBTV_HEAD,
 	LOCALE_WEBTV_XML,
 	LOCALE_WEBTV_XML_AUTO,
-	LOCALE_WEBTV_XML_PREF_QUALITY,
 	LOCALE_WINDOW_SIZE,
 	LOCALE_WIZARD_INITIAL_SETTINGS,
 	LOCALE_WIZARD_INSTALL_SETTINGS,

src/system/locals_intern.h

@@ -3067,7 +3067,6 @@ const char * locale_real_names[] =
 	"webtv.head",
 	"webtv.xml",
 	"webtv.xml.auto",
-	"webtv.xml.pref_quality",
 	"window_size",
 	"wizard.initial_settings",
 	"wizard.install_settings",

src/system/settings.h

@@ -741,7 +741,6 @@ struct SNeutrinoSettings
 	int widget_fade;
 
 	// webtv
-	int webtv_xml_quality;
 	int webtv_xml_auto;
 	std::list<std::string> webtv_xml;
 	std::string last_webtv_dir;