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

neutrino/miscsettings_menu: fix switching online-services

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ed421c9aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-21 (Sun, 21 Jan 2018)

Origin message was:
------------------
- neutrino/miscsettings_menu: fix switching online-services

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-01-21 22:02:27 +01:00
parent 6257d9f269
commit 49cb72db8a
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/miscsettings_menu.cpp
View File

@@ -726,30 +726,30 @@ bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void * /*data*
#endif
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_TMDB_API_KEY))
{
g_settings.tmdb_enabled = check_tmdb_api_key();
g_settings.tmdb_enabled = g_settings.tmdb_enabled && check_tmdb_api_key();
if (g_settings.tmdb_enabled)
tmdb_api_key_short = g_settings.tmdb_api_key.substr(0, 8) + "...";
else
tmdb_api_key_short.clear();
tmdb_onoff->setActive(g_settings.tmdb_enabled);
tmdb_onoff->setActive(check_tmdb_api_key());
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_YOUTUBE_DEV_ID))
{
g_settings.youtube_enabled = check_youtube_dev_id();
g_settings.youtube_enabled = g_settings.youtube_enabled && check_youtube_dev_id();
if (g_settings.youtube_enabled)
youtube_dev_id_short = g_settings.youtube_dev_id.substr(0, 8) + "...";
else
youtube_dev_id_short.clear();
youtube_onoff->setActive(g_settings.youtube_enabled);
youtube_onoff->setActive(check_youtube_dev_id());
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_SHOUTCAST_DEV_ID))
{
g_settings.shoutcast_enabled = check_shoutcast_dev_id();
g_settings.shoutcast_enabled = g_settings.shoutcast_enabled && check_shoutcast_dev_id();
if (g_settings.shoutcast_enabled)
shoutcast_dev_id_short = g_settings.shoutcast_dev_id.substr(0, 8) + "...";
else
shoutcast_dev_id_short.clear();
shoutcast_onoff->setActive(g_settings.shoutcast_enabled);
shoutcast_onoff->setActive(check_shoutcast_dev_id());
}
return ret;
}

6
src/neutrino.cpp
View File

@@ -929,17 +929,17 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.audioplayer_enable_sc_metadata = configfile.getInt32("audioplayer_enable_sc_metadata",1);
g_settings.shoutcast_dev_id = configfile.getString("shoutcast_dev_id","fa1669MuiRPorUBw"); //NI
g_settings.shoutcast_enabled = configfile.getInt32("shoutcast_enabled", 1);
g_settings.shoutcast_enabled = check_shoutcast_dev_id();
g_settings.shoutcast_enabled = g_settings.shoutcast_enabled && check_shoutcast_dev_id();
//Movie-Player
g_settings.movieplayer_repeat_on = configfile.getInt32("movieplayer_repeat_on", CMoviePlayerGui::REPEAT_OFF);
g_settings.movieplayer_bisection_jump = configfile.getInt32("movieplayer_bisection_jump", 5); //NI
g_settings.youtube_dev_id = configfile.getString("youtube_dev_id","AIzaSyBLdZe7M3rpNMZqSj-3IEvjbb2hATWJIdM"); //NI
g_settings.youtube_enabled = configfile.getInt32("youtube_enabled", 1);
g_settings.youtube_enabled = check_youtube_dev_id();
g_settings.youtube_enabled = g_settings.youtube_enabled && check_youtube_dev_id();
g_settings.tmdb_api_key = configfile.getString("tmdb_api_key","7270f1b571c4ecbb5b204ddb7f8939b1"); //NI
g_settings.tmdb_enabled = configfile.getInt32("tmdb_enabled", 1);
g_settings.tmdb_enabled = check_tmdb_api_key();
g_settings.tmdb_enabled = g_settings.tmdb_enabled && check_tmdb_api_key();
//Filebrowser
g_settings.filebrowser_showrights = configfile.getInt32("filebrowser_showrights", 1);