Recording and Transfer Mode now handle more than 2 audio PIDs

1 files changed, 19 insertions, 18 deletions

diff --git a/receiver.c b/receiver.c
index e9efac15..2fc36c9f 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 1.3 2002/07/28 15:14:49 kls Exp $
+ * $Id: receiver.c 1.4 2005/01/16 14:03:01 kls Exp $
  */
 
 #include <stdarg.h>
@@ -12,25 +12,28 @@
 #include "receiver.h"
 #include "tools.h"
 
-cReceiver::cReceiver(int Ca, int Priority, int NumPids, ...)
+cReceiver::cReceiver(int Ca, int Priority, int Pid, const int *Pids1, const int *Pids2, const int *Pids3)
 {
   device = NULL;
   ca = Ca;
   priority = Priority;
-  for (int i = 0; i < MAXRECEIVEPIDS; i++)
-      pids[i] = 0;
-  if (NumPids) {
-     va_list ap;
-     va_start(ap, NumPids);
-     int n = 0;
-     while (n < MAXRECEIVEPIDS && NumPids--) {
-           if ((pids[n] = va_arg(ap, int)) != 0)
-              n++;
-           }
-     va_end(ap);
+  numPids = 0;
+  if (Pid)
+     pids[numPids++] = Pid;
+  if (Pids1) {
+     while (*Pids1 && numPids < MAXRECEIVEPIDS)
+           pids[numPids++] = *Pids1++;
      }
-  else
-     esyslog("ERROR: cReceiver called without a PID!");
+  if (Pids2) {
+     while (*Pids2 && numPids < MAXRECEIVEPIDS)
+           pids[numPids++] = *Pids2++;
+     }
+  if (Pids3) {
+     while (*Pids3 && numPids < MAXRECEIVEPIDS)
+           pids[numPids++] = *Pids3++;
+     }
+  if (numPids >= MAXRECEIVEPIDS)
+     dsyslog("too many PIDs in cReceiver");
 }
 
 cReceiver::~cReceiver()
@@ -41,11 +44,9 @@ cReceiver::~cReceiver()
 bool cReceiver::WantsPid(int Pid)
 {
   if (Pid) {
-     for (int i = 0; i < MAXRECEIVEPIDS; i++) {
+     for (int i = 0; i < numPids; i++) {
          if (pids[i] == Pid)
             return true;
-         if (!pids[i])
-            break;
          }
      }
   return false;