From 018884d622d0d73253fbafe883b3ede0deab3227 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 12 Feb 2020 23:43:38 +0100 Subject: [PATCH] zapit/capmt: back to old stand but keep new indentation Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/faf52a192444c111f72d1085b4c3643346528683 Author: vanhofen 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 --- src/zapit/src/capmt.cpp | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index d56e68a83..ca3fc5edd 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -311,6 +311,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start INFO("\033[33m socket only\033[0m"); cam->makeCaPmt(channel, true); cam->setCaPmt(true); +#if 0 // CI CaIdVector 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); #else cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, mode, start); +#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"); if (mode) { if(start) { +#if 0 CaIdVector caids; cCA::GetInstance()->GetCAIDS(caids); 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; unsigned char * buffer = channel->getRawPmt(len); cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, mode, start); +#endif } else { 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 #else + mp = false; + /* 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->sendMessage(NULL, 0, false); @@ -378,9 +384,10 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start } // CI -#if ! HAVE_COOL_HARDWARE if (mode && !start) { -#endif + INFO("\033[33m (mode && !start) do we really need this?\033[0m"); + } + CaIdVector caids; cCA::GetInstance()->GetCAIDS(caids); //uint8_t list = CCam::CAPMT_FIRST; @@ -418,8 +425,6 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start ++it; if(!channel) continue; - if(!channel->scrambled) - continue; #if 0 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); #if HAVE_COOL_HARDWARE 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 - 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()); } 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) { useCI = true; INFO("CI: use CI for [%s]", channel->getName().c_str()); - } else - INFO("CI: no CI needed for [%s]", channel->getName().c_str()); +#if HAVE_COOL_HARDWARE + cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI); +#endif + } //list = CCam::CAPMT_MORE; +#if ! HAVE_COOL_HARDWARE if((oldmask != newmask) || force_update || (oldmask == newmask && mode && start)) { //temp debug output @@ -455,23 +460,15 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start 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); -#endif } -#if ! HAVE_COOL_HARDWARE else { cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI, false /*channel->scrambled*/, channel->camap, mode, start); } -#endif } - } -#if ! HAVE_COOL_HARDWARE - } #endif + } return true; }