From 3d81d6608eeb7d4b67fa42227aadf1f1584bc15e Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Thu, 26 Jan 2012 19:31:43 +0400 Subject: [PATCH] capmt: little cleanup Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d072a0e8b34719b53ed6f54c8f952724b00282bf Author: [CST] Focus Date: 2012-01-26 (Thu, 26 Jan 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/zapit/src/capmt.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index a994d9402..35ad4a1a8 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -184,13 +184,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start } printf("CCam::SetMode: channel %llx [%s] mode %d %s update %d\n", channel_id, channel->getName().c_str(), mode, start ? "START" : "STOP", force_update); mutex.lock(); -#if 0 - if(channel->getCaPmt() == NULL) { - printf("CCamManager: channel %llx dont have caPmt\n", channel_id); - mutex.unlock(); - return false; - } -#endif + cammap_iterator_t it = channel_map.find(channel_id); if(it != channel_map.end()) { cam = it->second; @@ -234,7 +228,6 @@ printf("CCam::SetMode: source %d old mask %d new mask %d force update %s\n", so if(newmask == 0) { /* FIXME: back to live channel from playback dont parse pmt and call setCaPmt * (see CMD_SB_LOCK / UNLOCK PLAYBACK */ - //channel->setCaPmt(NULL); //channel->setRawPmt(NULL);//FIXME channel_map.erase(channel_id); delete cam;