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

Attempt to fix problems after pmt updates. Please report, if comething wrong - with logs

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1929 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: f54ce0ede3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-12-02 (Fri, 02 Dec 2011)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2011-12-02 09:35:03 +00:00
parent 53bbc88fc1
commit e4b29536e3
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/zapit/src/cam.cpp
View File

@@ -137,8 +137,8 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id);
if(channel == NULL) {
printf("CCamManager: channel %llx not found\n", channel_id);
return false;
printf("CCamManager: channel %llx not found\n", channel_id);
return false;
}
mutex.lock();
@@ -151,11 +151,15 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
sat_iterator_t sit = satellitePositions.find(channel->getSatellitePosition());
cammap_iterator_t it = channel_map.find(channel_id);
if(it == channel_map.end()) {
if(it != channel_map.end()) {
cam = it->second;
} else if(start) {
cam = new CCam();
channel_map.insert(std::pair<t_channel_id, CCam*>(channel_id, cam));
} else
cam = it->second;
} else {
mutex.unlock();
return false;
}
switch(mode) {
case PLAY:
@@ -173,7 +177,10 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
}
oldmask = cam->getCaMask();
newmask = cam->makeMask(demux, start);
if(force_update)
newmask = oldmask;
else
newmask = cam->makeMask(demux, start);
if((oldmask != newmask) || force_update)
cam->setCaPmt(channel->getCaPmt(), source, newmask, true);