From 5a02f38d4239ec68f8737636f82abbd4b3933da8 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 17 Apr 2019 23:25:14 +0200 Subject: [PATCH] Revert "capmt.cpp: enable CI for recording only if necessary" This reverts commit 7d117a62de1c41bf1622e851d7f0341af9448129. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4e15906d78da16282a1996ef033c03b161a53cd7 Author: vanhofen Date: 2019-04-17 (Wed, 17 Apr 2019) ------------------ This commit was generated by Migit --- src/zapit/src/capmt.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index f9b0ea2ab..535905365 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -325,13 +325,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start cam->makeCaPmt(channel, false, list, caids); int len; unsigned char * buffer = channel->getRawPmt(len); - if(!filter_channels || !channel->bUseCI) { - //no CI needed - ca_map_t no_camap = std::set(); - cam->sendCaPmt(channel->getChannelID(), buffer, len, CA_SLOT_TYPE_CI, false /*channel->scrambled*/, no_camap /*channel->camap*/, mode, start); - } 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); } else { cam->sendCaPmt(channel->getChannelID(), NULL, 0, CA_SLOT_TYPE_CI, channel->scrambled, channel->camap, mode, start); }