From 6556b437c05eba308b98dd7bbd03925f91c5a6a3 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 28 Aug 2017 14:04:00 +0200 Subject: [PATCH] capmt: reduce console-spam, remove additional linefeeds from INFO-lines Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/108476a8b2bf32acf7d94356fdcf75e063a66dac Author: vanhofen 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 --- src/zapit/src/capmt.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index d04a92a58..9844372c8 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -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"); if((oldmask != newmask) || force_update) { - INFO(" ##NI: (oldmask != newmask) || force_update)"); + //INFO(" ##NI: (oldmask != newmask) || force_update)"); cam->setCaMask(newmask); cam->setSource(source); 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) { - INFO(" ##NI: (newmask == 0)"); + //INFO(" ##NI: (newmask == 0)"); /* FIXME: back to live channel from playback dont parse pmt and call setCaPmt * (see CMD_SB_LOCK / UNLOCK PLAYBACK */ //channel->setRawPmt(NULL);//FIXME @@ -300,7 +300,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start if(start) { if ((tunerno >= 0 && tunerno == cDemux::GetSource(cam->getSource())) || (filter_channels && channel->bUseCI)) { rmode = true; - INFO(" ##NI: rmode"); + //INFO(" ##NI: rmode"); } } else @@ -316,7 +316,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start list = CCam::CAPMT_ADD; #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; 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++; } 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); } #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); 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) { - 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 { 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); } //list = CCam::CAPMT_MORE;