[vdr] Re: VDR 1.2.0 fix: editchannel

[Andreas Schultz <aschultz@warp10.net>]

On Friday 06 June 2003 10:38 pm, Rene Bartsch wrote:

[...]

> > most certainly not. And what EPG problem? EPG works here as it should.
>
> After scanning a new channels.conf timers and epg-content was gone
> (files have been there, but VDR didn't display timers or epg anymore).

The attached patch should fix the timers problem. ChannelID comparision will
no longer fail on "magic-Rids".

The EPG Problem is still a mystery. I can't see anything that could cause
this, unless you start with an incomplete channels.conf (missing tid and nid)
of course.

Andreas

===== channels.c 1.25 vs edited =====
--- 1.25/channels.c     Fri May 30 21:56:18 2003
+++ edited/channels.c   Fri Jun  6 22:47:44 2003
@@ -126,7 +126,8 @@

 bool tChannelID::operator== (const tChannelID &arg) const
 {
-  return source == arg.source && nid == arg.nid && tid == arg.tid && sid == arg.sid && rid == arg.rid;
+
+  return source == arg.source && nid == arg.nid && tid == arg.tid && sid == arg.sid && (rid & 0x4000 || arg.rid & 0x4000 || rid == arg.rid);
 }

 tChannelID tChannelID::FromString(const char *s)



-- 
Info:
To unsubscribe send a mail to ecartis@linuxtv.org with "unsubscribe vdr" as subject.