From bcdfd6550cedc49017436b3f926752f6a512eb74 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 22 Nov 2018 23:42:33 +0100 Subject: [PATCH] webtv-setup: disable possibility to setup livestreamScriptPath ... Movieplayer searches automatically in default-directories for scripts Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5650194d072fa37ca02a1600596c00d3ececc12c Author: vanhofen Date: 2018-11-22 (Thu, 22 Nov 2018) Origin message was: ------------------ - webtv-setup: disable possibility to setup livestreamScriptPath ... Movieplayer searches automatically in default-directories for scripts ------------------ This commit was generated by Migit --- src/gui/movieplayer.cpp | 1 + src/gui/webtv_setup.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index fd9a4088c..42251313c 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1115,6 +1115,7 @@ bool CMoviePlayerGui::getLiveUrl(const std::string &url, const std::string &scri { std::list paths; // try livestreamScript from user's livestreamScriptPath + // Note: livestreamScriptPath is disabled in webtv-setup; just here for compatibility paths.push_back(g_settings.livestreamScriptPath); // try livestreamScripts from webradio/webtv autoload directories if (m_ThisMode == NeutrinoModes::mode_webradio) diff --git a/src/gui/webtv_setup.cpp b/src/gui/webtv_setup.cpp index 45cb98be5..f898b68f9 100644 --- a/src/gui/webtv_setup.cpp +++ b/src/gui/webtv_setup.cpp @@ -189,7 +189,7 @@ int CWebTVSetup::Show() m->addKey(CRCInput::RC_yellow, this, "e"); m->addKey(CRCInput::RC_blue, this, "r"); - m->addIntroItems(webradio ? LOCALE_WEBRADIO_HEAD : LOCALE_WEBTV_HEAD, LOCALE_LIVESTREAM_HEAD); + m->addIntroItems(webradio ? LOCALE_WEBRADIO_HEAD : LOCALE_WEBTV_HEAD); bool _mode_webtv = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv) && (!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()); @@ -199,14 +199,14 @@ int CWebTVSetup::Show() CMenuForwarder *mf; int shortcut = 1; +#if 0 mf = new CMenuForwarder(LOCALE_LIVESTREAM_SCRIPTPATH, !_mode_webtv || !_mode_webradio, g_settings.livestreamScriptPath, this, "script_path", CRCInput::convertDigitToKey(shortcut++)); m->addItem(mf); -#if 0 mf = new CMenuForwarder(LOCALE_LIVESTREAM_RESOLUTION, _mode_webtv, NULL, new CWebTVResolution(), NULL, CRCInput::convertDigitToKey(shortcut++)); m->addItem(mf); -#endif m->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, webradio ? LOCALE_WEBRADIO_XML : LOCALE_WEBTV_XML)); +#endif // TODO: show/hide autoloaded content when switching g_settings.webradio/webtv_xml_auto CMenuOptionChooser *oc;