mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

webtv-setup: disable possibility to setup livestreamScriptPath ...

Browse Source 
Movieplayer searches automatically in default-directories for scripts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5650194d07
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2018-11-22 23:42:33 +01:00
parent fcea282417
commit bcdfd6550c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/movieplayer.cpp
View File

@@ -1115,6 +1115,7 @@ bool CMoviePlayerGui::getLiveUrl(const std::string &url, const std::string &scri
{ {
std::list<std::string> paths; std::list<std::string> paths;
// try livestreamScript from user's livestreamScriptPath // try livestreamScript from user's livestreamScriptPath
// Note: livestreamScriptPath is disabled in webtv-setup; just here for compatibility
paths.push_back(g_settings.livestreamScriptPath); paths.push_back(g_settings.livestreamScriptPath);
// try livestreamScripts from webradio/webtv autoload directories // try livestreamScripts from webradio/webtv autoload directories
if (m_ThisMode == NeutrinoModes::mode_webradio) if (m_ThisMode == NeutrinoModes::mode_webradio)

6
src/gui/webtv_setup.cpp
View File

@@ -189,7 +189,7 @@ int CWebTVSetup::Show()
m->addKey(CRCInput::RC_yellow, this, "e"); m->addKey(CRCInput::RC_yellow, this, "e");
m->addKey(CRCInput::RC_blue, this, "r"); 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) && bool _mode_webtv = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv) &&
(!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()); (!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty());
@@ -199,14 +199,14 @@ int CWebTVSetup::Show()
CMenuForwarder *mf; CMenuForwarder *mf;
int shortcut = 1; int shortcut = 1;
#if 0
mf = new CMenuForwarder(LOCALE_LIVESTREAM_SCRIPTPATH, !_mode_webtv || !_mode_webradio, g_settings.livestreamScriptPath, this, "script_path", CRCInput::convertDigitToKey(shortcut++)); mf = new CMenuForwarder(LOCALE_LIVESTREAM_SCRIPTPATH, !_mode_webtv || !_mode_webradio, g_settings.livestreamScriptPath, this, "script_path", CRCInput::convertDigitToKey(shortcut++));
m->addItem(mf); m->addItem(mf);
#if 0
mf = new CMenuForwarder(LOCALE_LIVESTREAM_RESOLUTION, _mode_webtv, NULL, new CWebTVResolution(), NULL, CRCInput::convertDigitToKey(shortcut++)); mf = new CMenuForwarder(LOCALE_LIVESTREAM_RESOLUTION, _mode_webtv, NULL, new CWebTVResolution(), NULL, CRCInput::convertDigitToKey(shortcut++));
m->addItem(mf); m->addItem(mf);
#endif
m->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, webradio ? LOCALE_WEBRADIO_XML : LOCALE_WEBTV_XML)); 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 // TODO: show/hide autoloaded content when switching g_settings.webradio/webtv_xml_auto
CMenuOptionChooser *oc; CMenuOptionChooser *oc;