From 1d9ab9929f2c40c9c2a431ee0bd9eef042ecf5f3 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Thu, 5 Apr 2012 18:06:48 +0400 Subject: [PATCH] change ca->SendPMT() from DEMUX_SOURCE_2 to channel->getRecordDemux() --- src/driver/record.cpp | 2 +- src/zapit/src/zapit.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 349101d52..6721fd13a 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -195,7 +195,7 @@ record_error_msg_t CRecordInstance::Start(CZapitChannel * channel /*, APIDList & int len; unsigned char * pmt = channel->getRawPmt(len); cCA * ca = cCA::GetInstance(); - ca->SendPMT(DEMUX_SOURCE_2, pmt, len); + ca->SendPMT(channel->getRecordDemux() /*DEMUX_SOURCE_2*/, pmt, len); //CVFD::getInstance()->ShowIcon(VFD_ICON_CAM1, true); WaitRecMsg(msg_start_time, 2); diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 53a1bf68f..b1902a338 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -692,7 +692,10 @@ void CZapit::SetRecordMode(bool enable) } else { currentMode &= ~RECORD_MODE; - ca->SendPMT(DEMUX_SOURCE_2, (unsigned char*) "", 0, CA_SLOT_TYPE_SMARTCARD); + int demux = 2; + if(current_channel) + demux = current_channel->getRecordDemux(); + ca->SendPMT(demux /*DEMUX_SOURCE_2*/, (unsigned char*) "", 0, CA_SLOT_TYPE_SMARTCARD); event = CZapitClient::EVT_RECORDMODE_DEACTIVATED; } SendEvent(event);