Added initial CAM support.

HISTORY

@@ -225,3 +225,12 @@ VDR Plugin 'iptv' Revision History
 
 - Made devices to shutdown already in cPluginManager::Stop()
   to prevent possible crashes while VDR shutdown.
+
+
+==================================
+VDR Plugin 'iptv' Revision History
+==================================
+
+2014-XX-XX: Version 2.1.0
+
+- Added initial CAM support.

device.c

@@ -409,39 +409,66 @@ unsigned int cIptvDevice::CheckData(void)
   return 0;
 }
 
-bool cIptvDevice::GetTSPacket(uchar *&Data)
+uchar *cIptvDevice::GetData(int *availableP)
 {
   //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
   if (isOpenDvrM && tsBufferM && !IsBuffering()) {
-     if (isPacketDeliveredM) {
+     int count = 0;
-        tsBufferM->Del(TS_SIZE);
+     if (isPacketDeliveredM)
-        isPacketDeliveredM = false;
+        SkipData(TS_SIZE);
-        // Update buffer statistics
+     uchar *p = tsBufferM->Get(count);
-        AddBufferStatistic(TS_SIZE, tsBufferM->Available());
+     if (p && count >= TS_SIZE) {
-        }
-     int Count = 0;
-     uchar *p = tsBufferM->Get(Count);
-     if (p && Count >= TS_SIZE) {
         if (*p != TS_SYNC_BYTE) {
-           for (int i = 1; i < Count; i++) {
+           for (int i = 1; i < count; i++) {
                if (p[i] == TS_SYNC_BYTE) {
-                  Count = i;
+                  count = i;
                   break;
                   }
                }
-           tsBufferM->Del(Count);
+           tsBufferM->Del(count);
-           error("Skipped %d bytes to sync on TS packet", Count);
+           error("Skipped %d bytes to sync on TS packet", count);
-           return false;
+           return NULL;
            }
         isPacketDeliveredM = true;
-        Data = p;
+        if (availableP)
+           *availableP = count;
         // Update pid statistics
         AddPidStatistic(ts_pid(p), payload(p));
+        return p;
+        }
+     }
+  return NULL;
+}
+
+void cIptvDevice::SkipData(int countP)
+{
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  tsBufferM->Del(countP);
+  isPacketDeliveredM = false;
+  // Update buffer statistics
+  AddBufferStatistic(countP, tsBufferM->Available());
+}
+
+bool cIptvDevice::GetTSPacket(uchar *&dataP)
+{
+  //debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
+  if (tsBufferM) {
+     if (cCamSlot *cs = CamSlot()) {
+        if (cs->WantsTsData()) {
+           int available;
+           dataP = GetData(&available);
+           if (dataP) {
+              dataP = cs->Decrypt(dataP, available);
+              SkipData(available);
+              }
            return true;
            }
         }
+     dataP = GetData();
+     return true;
+     }
   // Reduce cpu load by preventing busylooping
   cCondWait::SleepMs(10);
-  Data = NULL;
+  dataP = NULL;
   return true;
 }

device.h

@@ -96,6 +96,10 @@ protected:
   virtual bool SetChannelDevice(const cChannel *channelP, bool liveViewP);
 
   // for recording
+private:
+  uchar *GetData(int *availableP = NULL);
+  void SkipData(int countP);
+
 protected:
   virtual bool SetPid(cPidHandle *handleP, int typeP, bool onP);
   virtual bool OpenDvr(void);

iptv.c

@@ -13,15 +13,15 @@
 #include "device.h"
 #include "iptvservice.h"
 
-#if defined(APIVERSNUM) && APIVERSNUM < 20000
+#if defined(APIVERSNUM) && APIVERSNUM < 20104
-#error "VDR-2.0.0 API version or greater is required!"
+#error "VDR-2.1.4 API version or greater is required!"
 #endif
 
 #ifndef GITVERSION
 #define GITVERSION ""
 #endif
 
-       const char VERSION[]     = "2.0.2" GITVERSION;
+       const char VERSION[]     = "2.1.0" GITVERSION;
 static const char DESCRIPTION[] = trNOOP("Experience the IPTV");
 
 class cPluginIptv : public cPlugin {

po/de_DE.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.2\n"
+"Project-Id-Version: vdr-iptv 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2014-01-08 01:18+0200\n"
 "PO-Revision-Date: 2014-01-08 01:18+0200\n"

po/fi_FI.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.2\n"
+"Project-Id-Version: vdr-iptv 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2014-01-08 01:18+0200\n"
 "PO-Revision-Date: 2014-01-08 01:18+0200\n"

po/fr_FR.po

@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.2\n"
+"Project-Id-Version: vdr-iptv 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2014-01-08 01:18+0200\n"
 "PO-Revision-Date: 2014-01-08 01:18+0200\n"

po/it_IT.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.2\n"
+"Project-Id-Version: vdr-iptv 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2014-01-08 01:18+0200\n"
 "PO-Revision-Date: 2014-01-08 01:18+0200\n"

po/nl_NL.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.2\n"
+"Project-Id-Version: vdr-iptv 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2014-01-08 01:18+0200\n"
 "PO-Revision-Date: 2014-01-08 01:18+0200\n"

po/ru_RU.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-iptv 2.0.2\n"
+"Project-Id-Version: vdr-iptv 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2014-01-08 01:18+0200\n"
 "PO-Revision-Date: 2014-01-08 01:18+0200\n"