mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 10:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- use HAVE_LIBSTB_HAL to fix coolstream build

Browse Source 
Conflicts:
	src/gui/cam_menu.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-01-18 11:36:58 +01:00
committed by Thilo Graf
parent fd5bb78036
commit 8b32701a89
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/cam_menu.cpp
View File

@@ -168,13 +168,15 @@ int CCAMMenuHandler::doMainMenu()
} }
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_IGNORE_MSG, &g_settings.ci_ignore_messages, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_IGNORE_MSG, &g_settings.ci_ignore_messages, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_SAVE_PINCODE, &g_settings.ci_save_pincode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_SAVE_PINCODE, &g_settings.ci_save_pincode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
#if HAVE_LIBSTB_HAL
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_CHECK_LIVE_SLOT, &g_settings.ci_check_live, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_CHECK_LIVE_SLOT, &g_settings.ci_check_live, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
#endif
#if 1
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_REC_ZAPTO, &g_settings.ci_rec_zapto, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_REC_ZAPTO, &g_settings.ci_rec_zapto, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
CMenuOptionChooser *ci_mode = new CMenuOptionChooser(LOCALE_CI_MODE, &g_settings.ci_mode, OPTIONS_CI_MODE_OPTIONS, OPTIONS_CI_MODE_OPTION_COUNT, true, NULL); CMenuOptionChooser *ci_mode = new CMenuOptionChooser(LOCALE_CI_MODE, &g_settings.ci_mode, OPTIONS_CI_MODE_OPTIONS, OPTIONS_CI_MODE_OPTION_COUNT, true, NULL);
cammenu->addItem(ci_mode); cammenu->addItem(ci_mode);
#endif
#ifdef BOXMODEL_CS_HD2 #ifdef BOXMODEL_CS_HD2
int fecount = CFEManager::getInstance()->getFrontendCount(); int fecount = CFEManager::getInstance()->getFrontendCount();
char fename[fecount+1][255]; char fename[fecount+1][255];
@@ -635,9 +637,11 @@ bool CCAMMenuHandler::changeNotify(const neutrino_locale_t OptionName, void * Da
g_settings.ci_pincode.clear(); g_settings.ci_pincode.clear();
} }
} }
#if HAVE_LIBSTB_HAL
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_CHECK_LIVE_SLOT)) { else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_CHECK_LIVE_SLOT)) {
ca->setCheckLiveSlot(g_settings.ci_check_live); ca->setCheckLiveSlot(g_settings.ci_check_live);
} }
#endif
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_TUNER)) { else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_TUNER)) {
printf("CCAMMenuHandler::changeNotify: bind CI to tuner %d\n", g_settings.ci_tuner); printf("CCAMMenuHandler::changeNotify: bind CI to tuner %d\n", g_settings.ci_tuner);
CCamManager::getInstance()->SetCITuner(g_settings.ci_tuner); CCamManager::getInstance()->SetCITuner(g_settings.ci_tuner);

2
src/neutrino.cpp
View File

@@ -2855,7 +2855,9 @@ TIMER_START();
delete hintBox; delete hintBox;
cCA::GetInstance()->Ready(true); cCA::GetInstance()->Ready(true);
#if HAVE_LIBSTB_HAL
cCA::GetInstance()->setCheckLiveSlot(g_settings.ci_check_live); cCA::GetInstance()->setCheckLiveSlot(g_settings.ci_check_live);
#endif
//InitZapper(); //InitZapper();
SHTDCNT::getInstance()->init(); SHTDCNT::getInstance()->init();