diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 61dd407c3..fe59a84ea 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1116,6 +1116,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 fa02db935..b7916d4a5 100644 --- a/src/gui/webtv_setup.cpp +++ b/src/gui/webtv_setup.cpp @@ -190,7 +190,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()); @@ -200,14 +200,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;