mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/capmt: fix coolstream build

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b66593443
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-12-19 (Thu, 19 Dec 2019)

Origin message was:
------------------
- zapit/capmt: fix coolstream build

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-12-19 23:31:35 +01:00
parent 9d210ca2a3
commit 73f591278c
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/zapit/src/capmt.cpp
View File

@@ -318,7 +318,11 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
cam->makeCaPmt(channel, false, list, caids); cam->makeCaPmt(channel, false, list, caids);
int len; int len;
unsigned char * buffer = channel->getRawPmt(len); unsigned char * buffer = channel->getRawPmt(len);
#if HAVE_COOL_HARDWARE
cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI);
#else
cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, mode, start); cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, mode, start);
#endif
} }
} }
@@ -431,8 +435,6 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, 0, true); cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, 0, true);
#endif #endif
/* out commented: causes a double send of capmt, the second without needed parameters */
#if HAVE_COOL_HARDWARE
if (tunerno >= 0 && tunerno != cDemux::GetSource(cam->getSource())) { if (tunerno >= 0 && tunerno != cDemux::GetSource(cam->getSource())) {
INFO("CI: configured tuner %d do not match %d, skip [%s]", tunerno, cam->getSource(), channel->getName().c_str()); INFO("CI: configured tuner %d do not match %d, skip [%s]", tunerno, cam->getSource(), channel->getName().c_str());
} else if (filter_channels && !channel->bUseCI) { } else if (filter_channels && !channel->bUseCI) {
@@ -440,8 +442,8 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
} else if(channel->scrambled) { } else if(channel->scrambled) {
useCI = true; useCI = true;
INFO("CI: use CI for [%s]", channel->getName().c_str()); INFO("CI: use CI for [%s]", channel->getName().c_str());
cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI); } else
} INFO("CI: no CI needed for [%s]", channel->getName().c_str());
//list = CCam::CAPMT_MORE; //list = CCam::CAPMT_MORE;
if((oldmask != newmask) || force_update || (oldmask == newmask && mode && start)) if((oldmask != newmask) || force_update || (oldmask == newmask && mode && start))
{ {
@@ -453,16 +455,19 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
if(useCI) if(useCI)
{ {
#if HAVE_COOL_HARDWARE
cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI);
#else
cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, 0, true); cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, 0, true);
#endif
} }
#if ! HAVE_COOL_HARDWARE
else else
{ {
INFO("\033[33m no CI needed\033[0m");
//no CI needed
cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI, false /*channel->scrambled*/, channel->camap, mode, start); cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI, false /*channel->scrambled*/, channel->camap, mode, start);
} }
}
#endif #endif
}
} }
#if ! HAVE_COOL_HARDWARE #if ! HAVE_COOL_HARDWARE
} }