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

zapit/capmt: back to old stand but keep new indentation

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: faf52a1924
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-02-12 (Wed, 12 Feb 2020)

Origin message was:
------------------
- zapit/capmt: back to old stand but keep new indentation

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-02-12 23:43:38 +01:00
parent 73b7d9b6cb
commit 018884d622
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,6 +311,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
INFO("\033[33m socket only\033[0m"); INFO("\033[33m socket only\033[0m");
cam->makeCaPmt(channel, true); cam->makeCaPmt(channel, true);
cam->setCaPmt(true); cam->setCaPmt(true);
#if 0
// CI // CI
CaIdVector caids; CaIdVector caids;
cCA::GetInstance()->GetCAIDS(caids); cCA::GetInstance()->GetCAIDS(caids);
@@ -322,6 +323,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI); cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI);
#else #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
#endif #endif
} }
} }
@@ -332,6 +334,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
INFO("\033[33m (oldmask == newmask)\033[0m"); INFO("\033[33m (oldmask == newmask)\033[0m");
if (mode) { if (mode) {
if(start) { if(start) {
#if 0
CaIdVector caids; CaIdVector caids;
cCA::GetInstance()->GetCAIDS(caids); cCA::GetInstance()->GetCAIDS(caids);
uint8_t list = CCam::CAPMT_ONLY; uint8_t list = CCam::CAPMT_ONLY;
@@ -339,6 +342,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
int len; int len;
unsigned char * buffer = channel->getRawPmt(len); unsigned char * buffer = channel->getRawPmt(len);
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
} else { } else {
cam->sendCaPmt(channel->getChannelID(), NULL, 0, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, mode, start); cam->sendCaPmt(channel->getChannelID(), NULL, 0, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, mode, start);
} }
@@ -369,6 +373,8 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
} }
#endif #endif
#else #else
mp = false;
/* don't use StopCam() here: ci-cam needs the real mode stop */ /* don't use StopCam() here: ci-cam needs the real mode stop */
cam->sendCaPmt(channel->getChannelID(), NULL, 0, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, mode, start); cam->sendCaPmt(channel->getChannelID(), NULL, 0, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, mode, start);
cam->sendMessage(NULL, 0, false); cam->sendMessage(NULL, 0, false);
@@ -378,9 +384,10 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
} }
// CI // CI
#if ! HAVE_COOL_HARDWARE
if (mode && !start) { if (mode && !start) {
#endif INFO("\033[33m (mode && !start) do we really need this?\033[0m");
}
CaIdVector caids; CaIdVector caids;
cCA::GetInstance()->GetCAIDS(caids); cCA::GetInstance()->GetCAIDS(caids);
//uint8_t list = CCam::CAPMT_FIRST; //uint8_t list = CCam::CAPMT_FIRST;
@@ -418,8 +425,6 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
++it; ++it;
if(!channel) if(!channel)
continue; continue;
if(!channel->scrambled)
continue;
#if 0 #if 0
if (it == channel_map.end()) if (it == channel_map.end())
@@ -431,10 +436,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
unsigned char * buffer = channel->getRawPmt(len); unsigned char * buffer = channel->getRawPmt(len);
#if HAVE_COOL_HARDWARE #if HAVE_COOL_HARDWARE
cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_SMARTCARD); cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_SMARTCARD);
#else
cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, 0, true);
#endif #endif
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) {
@@ -442,9 +444,12 @@ 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());
} else #if HAVE_COOL_HARDWARE
INFO("CI: no CI needed for [%s]", channel->getName().c_str()); cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI);
#endif
}
//list = CCam::CAPMT_MORE; //list = CCam::CAPMT_MORE;
#if ! HAVE_COOL_HARDWARE
if((oldmask != newmask) || force_update || (oldmask == newmask && mode && start)) if((oldmask != newmask) || force_update || (oldmask == newmask && mode && start))
{ {
//temp debug output //temp debug output
@@ -455,23 +460,15 @@ 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
{ {
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
} }
}
#if ! HAVE_COOL_HARDWARE
}
#endif #endif
}
return true; return true;
} }