add check-live-ci (thx DboxOldie)

Conflicts:
	src/gui/cam_menu.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d9defc6a6
Author: max_10 <max_10@gmx.de>
Date: 2016-07-08 (Fri, 08 Jul 2016)



------------------
This commit was generated by Migit
This commit is contained in:
max_10
2016-07-08 12:20:41 +02:00
committed by vanhofen
parent 37da5fbc64
commit 5e0c316c0c
7 changed files with 12 additions and 0 deletions

View File

@@ -492,6 +492,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
#endif
g_settings.ci_ignore_messages = configfile.getInt32("ci_ignore_messages", 0);
g_settings.ci_save_pincode = configfile.getInt32("ci_save_pincode", 0);
g_settings.ci_check_live = configfile.getInt32("ci_check_live", 0);
g_settings.ci_pincode = configfile.getString("ci_pincode", "");
g_settings.ci_tuner = configfile.getInt32("ci_tuner", -1);
g_settings.ci_rec_zapto = configfile.getInt32("ci_rec_zapto", 0); //NI
@@ -1483,6 +1484,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
#endif
configfile.setInt32("ci_ignore_messages", g_settings.ci_ignore_messages);
configfile.setInt32("ci_save_pincode", g_settings.ci_save_pincode);
configfile.setInt32("ci_check_live", g_settings.ci_check_live);
configfile.setString("ci_pincode", g_settings.ci_pincode);
configfile.setInt32("ci_tuner", g_settings.ci_tuner);
configfile.setInt32("ci_rec_zapto", g_settings.ci_rec_zapto); //NI
@@ -2939,6 +2941,7 @@ TIMER_START();
delete hintBox;
cCA::GetInstance()->Ready(true);
cCA::GetInstance()->setCheckLiveSlot(g_settings.ci_check_live);
//InitZapper();
SHTDCNT::getInstance()->init();