From 3f5c7e67eac370bfbc37b13779ebd7d9da3c2061 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Mon, 5 Jan 2004 12:55:07 +0100 Subject: [PATCH] Changed calculation of channel ids to make it work for tv stations that use the undefined NID value 0 --- CONTRIBUTORS | 2 ++ HISTORY | 2 ++ channels.c | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 1f011cfe..e04e477b 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -637,6 +637,8 @@ Teemu Rantanen for adding TS error checking to remux.c for pinpointing a problem with excessive memmove() calls in 'Transfer Mode' for fixing faulty calculation of section length in eit.c + for reporting a problem in calculation of channel ids for tv stations that use + the undefined NID value 0 Jan Ekholm for adding/improving some Swedish language OSD texts diff --git a/HISTORY b/HISTORY index 1a7ff0fb..3361dd2c 100644 --- a/HISTORY +++ b/HISTORY @@ -2552,3 +2552,5 @@ Video Disk Recorder Revision History now been adopted. - Fixed a crash in case there is no DVB hardware present (thanks to Sascha Volkenandt for reporting this one). +- Changed calculation of channel ids to make it work for tv stations that use + the undefined NID value 0 (thanks to Teemu Rantanen for reporting this one). diff --git a/channels.c b/channels.c index 9a7965f5..8101b82a 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 1.17 2004/01/04 12:28:49 kls Exp $ + * $Id: channels.c 1.18 2004/01/05 12:50:34 kls Exp $ */ #include "channels.h" @@ -227,7 +227,7 @@ int cChannel::Transponder(void) const tChannelID cChannel::GetChannelID(void) const { - return tChannelID(source, nid, nid ? tid : Transponder(), sid, rid); + return tChannelID(source, nid, (nid || tid) ? tid : Transponder(), sid, rid); } int cChannel::Modification(int Mask)