From 8b32701a89a500d943e2a7c0e59c25e8ab80f0d3 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sat, 18 Jan 2020 11:36:58 +0100 Subject: [PATCH] - use HAVE_LIBSTB_HAL to fix coolstream build Conflicts: src/gui/cam_menu.cpp Signed-off-by: Thilo Graf --- src/gui/cam_menu.cpp | 8 ++++++-- src/neutrino.cpp | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index f4d237d05..47f122832 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -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_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)); - +#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)); 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); - +#endif #ifdef BOXMODEL_CS_HD2 int fecount = CFEManager::getInstance()->getFrontendCount(); char fename[fecount+1][255]; @@ -635,9 +637,11 @@ bool CCAMMenuHandler::changeNotify(const neutrino_locale_t OptionName, void * Da g_settings.ci_pincode.clear(); } } +#if HAVE_LIBSTB_HAL else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_CHECK_LIVE_SLOT)) { ca->setCheckLiveSlot(g_settings.ci_check_live); } +#endif else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_TUNER)) { printf("CCAMMenuHandler::changeNotify: bind CI to tuner %d\n", g_settings.ci_tuner); CCamManager::getInstance()->SetCITuner(g_settings.ci_tuner); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index ee1427bda..52ba01c94 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2855,7 +2855,9 @@ TIMER_START(); delete hintBox; cCA::GetInstance()->Ready(true); +#if HAVE_LIBSTB_HAL cCA::GetInstance()->setCheckLiveSlot(g_settings.ci_check_live); +#endif //InitZapper(); SHTDCNT::getInstance()->init();