summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-01-16 15:52:15 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2004-01-16 15:52:15 +0100
commitcaf282e406256551995e09ed069079ad3fb2514e (patch)
treed2a1ccd9db4e64f423d17e6e2723e9ee71bf9d3d
parent6dd075fe53636a4dbdd585fb1e434d7bdfb1862b (diff)
downloadvdr-caf282e406256551995e09ed069079ad3fb2514e.tar.gz
vdr-caf282e406256551995e09ed069079ad3fb2514e.tar.bz2
Channels with a zero VPID no longer write a PPID into channels.conf
-rw-r--r--HISTORY1
-rw-r--r--pat.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 1a538b8a..1038d27d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2589,3 +2589,4 @@ Video Disk Recorder Revision History
- Activated detection of radio channels (to avoid reports about "channels not
being detected that used to be detected with the 'scan' utility or the
original 'autopid' patch ;-).
+- Channels with a zero VPID no longer write a PPID into channels.conf.
diff --git a/pat.c b/pat.c
index 312e2f15..d7cf862c 100644
--- a/pat.c
+++ b/pat.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: pat.c 1.4 2004/01/05 11:42:30 kls Exp $
+ * $Id: pat.c 1.5 2004/01/16 15:43:34 kls Exp $
*/
#include "pat.h"
@@ -369,7 +369,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
}
}
if (Setup.UpdateChannels >= 2) {
- Channel->SetPids(Vpid, Ppid, Apids[0], Apids[1], Dpids[0], Dpids[1], Tpid);
+ Channel->SetPids(Vpid, Vpid ? Ppid : 0, Apids[0], Apids[1], Dpids[0], Dpids[1], Tpid);
Channel->SetCaIds(CaDescriptors->CaIds());
Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
}