Fixed setting the PCR-PID in case it is equal to one of the other PIDs

1 files changed, 34 insertions, 21 deletions

diff --git a/device.c b/device.c
index 67da4571..9380f1d1 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.39 2003/04/12 11:51:04 kls Exp $
+ * $Id: device.c 1.40 2003/05/02 09:18:42 kls Exp $
  */
 
 #include "device.h"
@@ -224,15 +224,19 @@ bool cDevice::HasPid(int Pid) const
 
 bool cDevice::AddPid(int Pid, ePidType PidType)
 {
-  if (Pid) {
+  if (Pid || PidType == ptPcr) {
      int n = -1;
      int a = -1;
-     for (int i = 0; i < MAXPIDHANDLES; i++) {
-         if (pidHandles[i].pid == Pid)
-            n = i;
-         else if (a < 0 && i >= ptOther && !pidHandles[i].used)
-            a = i;
-         }
+     if (PidType != ptPcr) { // PPID always has to be explicit
+        for (int i = 0; i < MAXPIDHANDLES; i++) {
+            if (i != ptPcr) {
+               if (pidHandles[i].pid == Pid)
+                  n = i;
+               else if (a < 0 && i >= ptOther && !pidHandles[i].used)
+                  a = i;
+               }
+            }
+        }
      if (n >= 0) {
         // The Pid is already in use
         if (++pidHandles[n].used == 2 && n <= ptTeletext) {
@@ -263,22 +267,31 @@ bool cDevice::AddPid(int Pid, ePidType PidType)
   return true;
 }
 
-void cDevice::DelPid(int Pid)
+void cDevice::DelPid(int Pid, ePidType PidType)
 {
-  if (Pid) {
-     for (int i = 0; i < MAXPIDHANDLES; i++) {
-         if (pidHandles[i].pid == Pid) {
-            PRINTPIDS("D");
-            if (--pidHandles[i].used < 2) {
-               SetPid(&pidHandles[i], i, false);
-               if (pidHandles[i].used == 0) {
-                  pidHandles[i].handle = -1;
-                  pidHandles[i].pid = 0;
-                  }
+  if (Pid || PidType == ptPcr) {
+     int n = -1;
+     if (PidType == ptPcr)
+        n = PidType; // PPID always has to be explicit
+     else {
+        for (int i = 0; i < MAXPIDHANDLES; i++) {
+            if (pidHandles[i].pid == Pid) {
+               n = i;
+               break;
                }
-            PRINTPIDS("E");
             }
-         }
+        }
+     if (n >= 0 && pidHandles[n].used) {
+        PRINTPIDS("D");
+        if (--pidHandles[n].used < 2) {
+           SetPid(&pidHandles[n], n, false);
+           if (pidHandles[n].used == 0) {
+              pidHandles[n].handle = -1;
+              pidHandles[n].pid = 0;
+              }
+           }
+        PRINTPIDS("E");
+        }
      }
 }