frodovdr/vdr-plugin-satip
1
0
Fork 0
mirror of https://github.com/rofafor/vdr-plugin-satip.git synced 2023-10-10 13:37:42 +02:00
Code Issues Releases Wiki Activity

Added SATIP_XCI variable for enabling CI support.

Browse Source
This commit is contained in:
Rolf Ahrenberg 2015-01-10 18:30:07 +02:00
parent 755f1049bb
commit acea8748a4
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -10,6 +10,10 @@
#SATIP_USE_TINYXML = 1 #SATIP_USE_TINYXML = 1
# Enable CI extension - requires VDR API implementing GetPmt(int, int, int)
#SATIP_XCI = 1
# Strip debug symbols? Set eg. to /bin/true if not # Strip debug symbols? Set eg. to /bin/true if not
STRIP = strip STRIP = strip
@ -76,8 +80,16 @@ LIBS += -lpugixml
endif endif
ifdef SATIP_DEBUG ifdef SATIP_DEBUG
ifeq ($(SATIP_DEBUG),1)
DEFINES += -DDEBUG DEFINES += -DDEBUG
endif endif
endif
ifdef SATIP_XCI
ifeq ($(SATIP_XCI),1)
DEFINES += -DXCI
endif
endif
ifneq ($(strip $(GITTAG)),) ifneq ($(strip $(GITTAG)),)
DEFINES += -DGITVERSION='"-GIT-$(GITTAG)"' DEFINES += -DGITVERSION='"-GIT-$(GITTAG)"'

1
README
View File

@ -27,7 +27,6 @@ Requirements:
http://www.gnu.org/software/libc/ http://www.gnu.org/software/libc/
- VDR >= 2.1.4 for scrambled channels - VDR >= 2.1.4 for scrambled channels
>= 2.1.7 for Digital Devices CI extension
Description: Description:

2
device.c
View File

@ -431,7 +431,7 @@ int cSatipDevice::GetId(void)
int cSatipDevice::GetPmtPid(void) int cSatipDevice::GetPmtPid(void)
{ {
int pid = 0; int pid = 0;
#if defined(APIVERSNUM) && APIVERSNUM >= 20107 #ifdef XCI
pid = channelM.Ca() ? ::GetPmtPid(channelM.Source(), channelM.Transponder(), channelM.Sid()) : 0; pid = channelM.Ca() ? ::GetPmtPid(channelM.Source(), channelM.Transponder(), channelM.Sid()) : 0;
#endif #endif
debug11("%s pmtpid=%d source=%c transponder=%d sid=%d name=%s [device %u]", __PRETTY_FUNCTION__, pid, cSource::ToChar(channelM.Source()), channelM.Transponder(), channelM.Sid(), channelM.Name(), deviceIndexM); debug11("%s pmtpid=%d source=%c transponder=%d sid=%d name=%s [device %u]", __PRETTY_FUNCTION__, pid, cSource::ToChar(channelM.Source()), channelM.Transponder(), channelM.Sid(), channelM.Name(), deviceIndexM);

2
setup.c
View File

@ -368,7 +368,7 @@ void cSatipPluginSetup::Setup(void)
helpM.Append(tr("Define the used operating mode for all SAT>IP devices:\n\noff - devices are disabled\nlow - devices are working at the lowest priority\nnormal - devices are working within normal parameters\nhigh - devices are working at the highest priority")); helpM.Append(tr("Define the used operating mode for all SAT>IP devices:\n\noff - devices are disabled\nlow - devices are working at the lowest priority\nnormal - devices are working within normal parameters\nhigh - devices are working at the highest priority"));
if (operatingModeM) { if (operatingModeM) {
#if defined(APIVERSNUM) && APIVERSNUM >= 20107 #ifdef XCI
Add(new cMenuEditBoolItem(tr("Enable CI extension"), &ciExtensionM)); Add(new cMenuEditBoolItem(tr("Enable CI extension"), &ciExtensionM));
helpM.Append(tr("Define whether a CI extension shall be used.\n\nThis setting enables integrated CI/CAM handling found in some SAT>IP hardware (e.g. Digital Devices OctopusNet).")); helpM.Append(tr("Define whether a CI extension shall be used.\n\nThis setting enables integrated CI/CAM handling found in some SAT>IP hardware (e.g. Digital Devices OctopusNet)."));
#endif #endif