frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Changed calculation of channel ids to make it work for tv stations that use the undefined NID value 0

This commit is contained in:
Klaus Schmidinger 2004-01-05 12:55:07 +01:00
parent 0901afcf6d
commit 3f5c7e67ea
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -637,6 +637,8 @@ Teemu Rantanen <tvr@iki.fi>
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 <chakie@infa.abo.fi>
for adding/improving some Swedish language OSD texts

2
HISTORY
View File

@ -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).

4
channels.c
View File

@ -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)