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

capmt: reduce console-spam, remove additional linefeeds from INFO-lines

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 108476a8b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)

Origin message was:
------------------
- capmt: reduce console-spam, remove additional linefeeds from INFO-lines

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-28 14:04:00 +02:00
parent 76b23bcf9f
commit 6556b437c0
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -265,7 +265,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
//INFO("source %d old mask %d new mask %d force update %s", source, oldmask, newmask, force_update ? "yes" : "no"); //INFO("source %d old mask %d new mask %d force update %s", source, oldmask, newmask, force_update ? "yes" : "no");
if((oldmask != newmask) || force_update) { if((oldmask != newmask) || force_update) {
INFO(" ##NI: (oldmask != newmask) || force_update)"); //INFO(" ##NI: (oldmask != newmask) || force_update)");
cam->setCaMask(newmask); cam->setCaMask(newmask);
cam->setSource(source); cam->setSource(source);
if(newmask != 0 && (!filter_channels || !channel->bUseCI)) { if(newmask != 0 && (!filter_channels || !channel->bUseCI)) {
@@ -275,7 +275,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
} }
if(newmask == 0) { if(newmask == 0) {
INFO(" ##NI: (newmask == 0)"); //INFO(" ##NI: (newmask == 0)");
/* FIXME: back to live channel from playback dont parse pmt and call setCaPmt /* FIXME: back to live channel from playback dont parse pmt and call setCaPmt
* (see CMD_SB_LOCK / UNLOCK PLAYBACK */ * (see CMD_SB_LOCK / UNLOCK PLAYBACK */
//channel->setRawPmt(NULL);//FIXME //channel->setRawPmt(NULL);//FIXME
@@ -300,7 +300,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
if(start) { if(start) {
if ((tunerno >= 0 && tunerno == cDemux::GetSource(cam->getSource())) || (filter_channels && channel->bUseCI)) { if ((tunerno >= 0 && tunerno == cDemux::GetSource(cam->getSource())) || (filter_channels && channel->bUseCI)) {
rmode = true; rmode = true;
INFO(" ##NI: rmode"); //INFO(" ##NI: rmode");
} }
} else } else
@@ -316,7 +316,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
list = CCam::CAPMT_ADD; list = CCam::CAPMT_ADD;
#ifdef BOXMODEL_CS_HD2 #ifdef BOXMODEL_CS_HD2
INFO(" ##NI: channel_map.size() %d",channel_map.size()); //INFO(" ##NI: channel_map.size() %d",channel_map.size());
int ci_use_count = 0; int ci_use_count = 0;
for (it = channel_map.begin(); it != channel_map.end(); ++it) for (it = channel_map.begin(); it != channel_map.end(); ++it)
{ {
@@ -334,7 +334,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
ci_use_count++; ci_use_count++;
} }
if (ci_use_count == 0) { if (ci_use_count == 0) {
INFO("CI: not used for [%s], disabling TS\n",channel->getName().c_str()); INFO("CI: not used for [%s], disabling TS",channel->getName().c_str());
cCA::GetInstance()->SetTS(CA_DVBCI_TS_INPUT_DISABLED); cCA::GetInstance()->SetTS(CA_DVBCI_TS_INPUT_DISABLED);
} }
#endif #endif
@@ -358,12 +358,12 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_SMARTCARD); cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_SMARTCARD);
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]\n", 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) {
INFO("CI: filter enabled, CI not used for [%s]\n", channel->getName().c_str()); INFO("CI: filter enabled, CI not used for [%s]", channel->getName().c_str());
} else { } else {
useCI = true; //NI useCI = true; //NI
INFO("CI: use CI for [%s]\n", channel->getName().c_str()); INFO("CI: use CI for [%s]", channel->getName().c_str());
cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI); cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI);
} }
//list = CCam::CAPMT_MORE; //list = CCam::CAPMT_MORE;