From be69e2a19f712689284e6b921dfc6cb6f672954c Mon Sep 17 00:00:00 2001
From: Jochen Dolze <vdr@dolze.de>
Date: Sun, 7 Mar 2010 12:25:10 +0100
Subject: Fixed error in recv.cpp constructor

---
 recv.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'recv.cpp')

diff --git a/recv.cpp b/recv.cpp
index 4192f72..378317e 100644
--- a/recv.cpp
+++ b/recv.cpp
@@ -11,7 +11,7 @@
 #if APIVERSNUM > 10711
 cMarkAdReceiver::cMarkAdReceiver(int RecvNumber, const char *Filename, cTimer *Timer)
         :
-        cReceiver(Timer->Channel()->GetChannelID(), -1),
+        cReceiver(NULL, -1),
         cThread("markad"),
         buffer(MEGATS(3)), running(false) // 3MB Buffer
 #else
@@ -25,6 +25,11 @@ cMarkAdReceiver::cMarkAdReceiver(int RecvNumber, const char *Filename, cTimer *T
 {
     if ((!Filename) || (!Timer)) return;
 
+#if APIVERSNUM > 10711
+    AddPid(Timer->Channel()->VPid());
+    AddPid(Timer->Channel()->Dpid(0));
+#endif
+
     recvnumber=RecvNumber;
     filename=strdup(Filename);
 
@@ -34,9 +39,6 @@ cMarkAdReceiver::cMarkAdReceiver(int RecvNumber, const char *Filename, cTimer *T
     memset(&macontext,0,sizeof(macontext));
     macontext.General.VPid.Num=Timer->Channel()->Vpid();
 
-#if APIVERSNUM == 10700
-#error "VDR-1.7.0 is not supported"
-#endif
 #if APIVERSNUM > 10700
     switch Timer->Channel()->Vtype()
     {
@@ -52,7 +54,11 @@ cMarkAdReceiver::cMarkAdReceiver(int RecvNumber, const char *Filename, cTimer *T
         break;
     }
 #else
+#if APIVERSNUM < 10700
     macontext.General.VPid.Type=MARKAD_PIDTYPE_VIDEO_H262;
+#else
+#error "VDR-1.7.0 is not supported"
+#endif
 #endif
 
     macontext.General.DPid.Num=Timer->Channel()->Dpid(0); // ... better solution?
-- 
cgit v1.2.3