mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/src/capmt.cpp: try to fix TS enable/disable

Browse Source
This commit is contained in:
[CST] Focus
2015-12-08 14:46:41 +03:00
parent 598ef23982
commit 0aa71bae4d
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,12 +273,37 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
StopCam(channel_id, cam); StopCam(channel_id, cam);
} }
CaIdVector caids; CaIdVector caids;
cCA::GetInstance()->GetCAIDS(caids); cCA::GetInstance()->GetCAIDS(caids);
//uint8_t list = CCam::CAPMT_FIRST; //uint8_t list = CCam::CAPMT_FIRST;
uint8_t list = CCam::CAPMT_ONLY; uint8_t list = CCam::CAPMT_ONLY;
if (channel_map.size() > 1) if (channel_map.size() > 1)
list = CCam::CAPMT_ADD; list = CCam::CAPMT_ADD;
#ifdef BOXMODEL_APOLLO
int ci_use_count = 0;
for (it = channel_map.begin(); it != channel_map.end(); ++it)
{
cam = it->second;
channel = CServiceManager::getInstance()->FindChannel(it->first);
if (tunerno >= 0 && tunerno == cDemux::GetSource(cam->getSource())) {
cCA::GetInstance()->SetTS((CA_DVBCI_TS_INPUT)tunerno);
ci_use_count++;
break;
} else if (filter_channels) {
if (channel && channel->bUseCI)
ci_use_count++;
} else
ci_use_count++;
}
if (ci_use_count == 0) {
INFO("CI: not used, disabling TS\n");
cCA::GetInstance()->SetTS(CA_DVBCI_TS_INPUT_DISABLED);
}
#endif
for (it = channel_map.begin(); it != channel_map.end(); /*++it*/) for (it = channel_map.begin(); it != channel_map.end(); /*++it*/)
{ {
cam = it->second; cam = it->second;
@@ -298,17 +323,10 @@ 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...\n", tunerno, cam->getSource()); INFO("CI: configured tuner %d do not match %d, skip [%s]\n", 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, disabling TS\n"); INFO("CI: filter enabled, CI not used for [%s]\n", channel->getName().c_str());
#ifdef BOXMODEL_APOLLO
cCA::GetInstance()->SetTS(CA_DVBCI_TS_INPUT_DISABLED);
#endif
} else { } else {
#ifdef BOXMODEL_APOLLO
if (tunerno >= 0)
cCA::GetInstance()->SetTS((CA_DVBCI_TS_INPUT)tunerno);
#endif
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;