summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2009-04-10 11:34:33 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2009-04-10 11:34:33 +0200
commitaf89f39e82106cae52bdc55c13ffbd21705f448b (patch)
tree78e9c946bce585211072ec2f7c4b49a8001fb096
parentee97c6abee411dc269e54cf322586bc888c24c8d (diff)
downloadvdr-af89f39e82106cae52bdc55c13ffbd21705f448b.tar.gz
vdr-af89f39e82106cae52bdc55c13ffbd21705f448b.tar.bz2
No longer writing the video type into channels.conf if VPID is 0
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY2
-rw-r--r--channels.c4
3 files changed, 6 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6d6cd032..a9c61d2c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -667,6 +667,8 @@ Oliver Endriss <o.endriss@gmx.de>
for pointing out a problem with the decimal point of the F record in the info file of
a recording
for adding missing AUDIO_PAUSE/AUDIO_CONTINUE calls to cDvbDevice
+ for reporting that the video type is unnecessarily written into channels.conf if
+ VPID is 0
Reinhard Walter Buchner <rw.buchner@freenet.de>
for adding some satellites to 'sources.conf'
diff --git a/HISTORY b/HISTORY
index 6fbbdce0..71780fc2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6027,3 +6027,5 @@ Video Disk Recorder Revision History
- Fixed detecting the frame rate for radio recordings.
- Added missing AUDIO_PAUSE/AUDIO_CONTINUE calls to cDvbDevice (thanks to Oliver
Endriss).
+- No longer writing the video type into channels.conf if VPID is 0 (thanks to
+ Oliver Endriss for reporting this).
diff --git a/channels.c b/channels.c
index b4fea76b..46a8196b 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: channels.c 2.4 2008/12/13 11:42:15 kls Exp $
+ * $Id: channels.c 2.5 2009/04/10 11:29:55 kls Exp $
*/
#include "channels.h"
@@ -724,7 +724,7 @@ cString cChannel::ToText(const cChannel *Channel)
q += snprintf(q, sizeof(vpidbuf), "%d", Channel->vpid);
if (Channel->ppid && Channel->ppid != Channel->vpid)
q += snprintf(q, sizeof(vpidbuf) - (q - vpidbuf), "+%d", Channel->ppid);
- if (Channel->vtype)
+ if (Channel->vpid && Channel->vtype)
q += snprintf(q, sizeof(vpidbuf) - (q - vpidbuf), "=%d", Channel->vtype);
*q = 0;
const int BufferSize = (MAXAPIDS + MAXDPIDS) * (5 + 1 + MAXLANGCODE2) + 10; // 5 digits plus delimiting ',' or ';' plus optional '=cod+cod', +10: paranoia