[vdr] iptv 0.2.1 - one reject

[Rolf Ahrenberg]

On Sat, 19 Jul 2008, Goga777 wrote:

> channels.h.rej
> --- 217,223 ----
>    int RollOff(void) const { return rollOff; }
>    const cLinkChannels* LinkChannels(void) const { return linkChannels; }
>    const cChannel *RefChannel(void) const { return refChannel; }
> +   bool IsPlug(void) const { return cSource::IsPlug(source); }
>    bool IsCable(void) const { return cSource::IsCable(source); }
>    bool IsSat(void) const { return cSource::IsSat(source); }
>    bool IsTerr(void) const { return cSource::IsTerr(source); }

You'll have to add manually the "IsPlug" line into channels.h just 
before the "IsCable" line.

BR,
--
rofa