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

- fix coolstream build

Browse Source 
Conflicts:
	src/zapit/src/zapit.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-01-20 21:33:46 +01:00
committed by Thilo Graf
parent cf114aefae
commit 9019dc0e56
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/cam_menu.cpp
View File

@@ -638,7 +638,11 @@ bool CCAMMenuHandler::changeNotify(const neutrino_locale_t OptionName, void * Da
if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_CLOCK)) {
for (unsigned int i = 0; i < ca->GetNumberCISlots(); i++) {
printf("CCAMMenuHandler::changeNotify: ci_clock[%d] %d\n", i, g_settings.ci_clock[i]);
#if HAVE_LIBSTB_HAL
ca->SetTSClock(g_settings.ci_clock[i] * 1000000, i);
#else
ca->SetTSClock(g_settings.ci_clock[i] * 1000000);
#endif
}
return true;
}

31
src/zapit/src/zapit.cpp
View File

@@ -2579,24 +2579,29 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
}
/* CA_INIT_CI or CA_INIT_SC or CA_INIT_BOTH */
switch(config.cam_ci){
case 2:
ca->SetInitMask(CA_INIT_BOTH);
break;
case 1:
ca->SetInitMask(CA_INIT_CI);
break;
case 0:
ca->SetInitMask(CA_INIT_SC);
break;
default:
ca->SetInitMask(CA_INIT_BOTH);
break;
switch(config.cam_ci)
{
case 2:
ca->SetInitMask(CA_INIT_BOTH);
break;
case 1:
ca->SetInitMask(CA_INIT_CI);
break;
case 0:
ca->SetInitMask(CA_INIT_SC);
break;
default:
ca->SetInitMask(CA_INIT_BOTH);
break;
}
// set ci clock to ZapStart_arg->ci_clock
for (uint32_t i = 0; i < ca->GetNumberCISlots(); i++) {
#if HAVE_LIBSTB_HAL
ca->SetTSClock(ZapStart_arg->ci_clock[i] * 1000000, i);
#else
ca->SetTSClock(ZapStart_arg->ci_clock[i] * 1000000);
#endif
}
#if BOXMODEL_VUPLUS