From 7cd92a9905d980b101147e26bf15e4df5963350b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 18 Jan 2020 11:36:58 +0100 Subject: [PATCH] use HAVE_LIBSTB_HAL to fix coolstream build Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/13106b016bd452c8b132536e884a7ab9442af2f1 Author: vanhofen Date: 2020-01-18 (Sat, 18 Jan 2020) Origin message was: ------------------ - use HAVE_LIBSTB_HAL to fix coolstream build ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/cam_menu.cpp | 4 ++++ src/neutrino.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index d70fa9738..dce3ffa89 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -169,7 +169,9 @@ 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 //NI 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); @@ -636,9 +638,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 9faf29990..85d965681 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2944,7 +2944,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();