git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1043 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: e9d9a1fdd4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-01-26 (Wed, 26 Jan 2011)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2011-01-26 09:01:38 +00:00
parent 8aa4fdefac
commit ccf5780bf7

View File

@@ -375,7 +375,7 @@ void start_camd(bool forupdate = false)
} else {
/* zap back to rec. channel */
camask = 5; // demux 0 + 2
cam0->setCaPmt(g_current_channel->getCaPmt(), DEMUX_SOURCE_0, cam0->getCaMask() | DEMUX_DECODE_2 /*camask*/, true); // update
cam0->setCaPmt(g_current_channel->getCaPmt(), DEMUX_SOURCE_0, cam0->getCaMask() | DEMUX_DECODE_0 | DEMUX_DECODE_2 /*camask*/, true); // update
cam1->sendMessage(0,0); // stop/close
}
} else {
@@ -718,7 +718,7 @@ void unsetRecordMode(void)
if(standby)
cam0->sendMessage(0,0); // stop
else if(live_channel_id == rec_channel_id) {
cam0->setCaPmt(g_current_channel->getCaPmt(), DEMUX_SOURCE_0, cam0->getCaMask() & ~DEMUX_DECODE_2 /*1*/, true); // demux 0, update
cam0->setCaPmt(g_current_channel->getCaPmt(), DEMUX_SOURCE_0, (cam0->getCaMask() | DEMUX_DECODE_0) & ~DEMUX_DECODE_2 /*1*/, true); // demux 0, update
} else {
cam1->sendMessage(0,0); // stop
cam0->setCaPmt(g_current_channel->getCaPmt(), DEMUX_SOURCE_0, cam0->getCaMask() & ~DEMUX_DECODE_2 /*1*/); // start