Removed SATIP_XCI.

Makefile

@@ -10,10 +10,6 @@
 
 #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 = strip
@@ -85,18 +81,6 @@ DEFINES += -DDEBUG
 endif
 endif
 
-ifdef SATIP_XCI
-ifeq ($(SATIP_XCI),1)
-DEFINES += -DXCI
-endif
-endif
-
-ifdef SATIP_USE_SINGLE_MODEL_SERVERS_ONLY
-ifeq ($(SATIP_USE_SINGLE_MODEL_SERVERS_ONLY),1)
-DEFINES += -DUSE_SINGLE_MODEL_SERVERS_ONLY
-endif
-endif
-
 ifneq ($(strip $(GITTAG)),)
 DEFINES += -DGITVERSION='"-GIT-$(GITTAG)"'
 endif

README

@@ -28,6 +28,8 @@ Requirements:
 
 - VDR >= 2.1.4 for scrambled channels
 
+- VDR >= 2.1.7 for external CI
+
 Description:
 
 This plugin integrates SAT>IP network devices seamlessly into VDR.

device.c

@@ -435,7 +435,7 @@ int cSatipDevice::GetId(void)
 int cSatipDevice::GetPmtPid(void)
 {
   int pid = 0;
-#ifdef XCI
+#if defined(APIVERSNUM) && APIVERSNUM >= 20107
   pid = channelM.Ca() ? ::GetPmtPid(channelM.Source(), channelM.Transponder(), channelM.Sid()) : 0;
 #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);

setup.c

@@ -372,7 +372,6 @@ 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"));
 
   if (operatingModeM) {
-#ifdef XCI
      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)."));
 
@@ -380,7 +379,7 @@ void cSatipPluginSetup::Setup(void)
          Add(new cMenuEditStraItem(*cString::sprintf(" %s #%d", tr("CI/CAM"), i + 1), &cicamsM[i], ELEMENTS(cicamTextsM), cicamTextsM));
          helpM.Append(tr("Define a desired CAM type for the CI slot.\n\nThe '---' option lets SAT>IP hardware do the auto-selection."));
          }
-#endif
+
      Add(new cMenuEditBoolItem(tr("Enable EPG scanning"), &eitScanM));
      helpM.Append(tr("Define whether the EPG background scanning shall be used.\n\nThis setting disables the automatic EIT scanning functionality for all SAT>IP devices."));