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

When checking for obsolete channels, those with an RID that is not 0 are now ignored

This commit is contained in:
Klaus Schmidinger 2014-03-10 13:17:11 +01:00
parent ebdac2ddfc
commit 76c32d60f9
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

@ -709,6 +709,8 @@ Oliver Endriss <o.endriss@gmx.de>
for suggesting to eliminate MAXDVBDEVICES
for reporting that there are channels that need even more than 10 TS packets in order
to detect the frame type
for suggesting to ignore channels with an RID that is not 0 when checking for obsolete
channels
Reinhard Walter Buchner <rw.buchner@freenet.de>
for adding some satellites to 'sources.conf'

2
HISTORY
View File

@ -8224,3 +8224,5 @@ Video Disk Recorder Revision History
is opened.
- Updated the Finnish OSD texts (thanks to Antti Hartikainen).
- Fixed drawing the live indicator in the LCARS skin in case there are no devices.
- When checking for obsolete channels, those with an RID that is not 0 are now
ignored (suggested by Oliver Endriss).

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 3.4 2014/01/04 15:01:52 kls Exp $
* $Id: channels.c 3.5 2014/03/10 13:14:02 kls Exp $
*/
#include "channels.h"
@ -1039,7 +1039,7 @@ cChannel *cChannels::NewChannel(const cChannel *Transponder, const char *Name, c
void cChannels::MarkObsoleteChannels(int Source, int Nid, int Tid)
{
for (cChannel *channel = First(); channel; channel = Next(channel)) {
if (time(NULL) - channel->Seen() > CHANNELTIMEOBSOLETE && channel->Source() == Source && channel->Nid() == Nid && channel->Tid() == Tid) {
if (time(NULL) - channel->Seen() > CHANNELTIMEOBSOLETE && channel->Source() == Source && channel->Nid() == Nid && channel->Tid() == Tid && channel->Rid() == 0) {
if (!endswith(channel->Name(), CHANNELMARKOBSOLETE))
channel->SetName(cString::sprintf("%s %s", channel->Name(), CHANNELMARKOBSOLETE), channel->ShortName(), cString::sprintf("%s %s", CHANNELMARKOBSOLETE, channel->Provider()));
}