diff -urNad vdr-plugin-lcdproc-0.0.10~/lcdproc.c vdr-plugin-lcdproc-0.0.10/lcdproc.c --- vdr-plugin-lcdproc-0.0.10~/lcdproc.c 2006-01-26 00:09:30.000000000 +0100 +++ vdr-plugin-lcdproc-0.0.10/lcdproc.c 2006-01-26 00:10:12.000000000 +0100 @@ -51,8 +51,13 @@ class cLcdFeed : public cStatus { protected: virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber); +#if VDRVERSNUM >= 10338 + virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On); + virtual void Replaying(const cControl *DvbPlayerControl, const char *Name, const char *FileName, bool On); +#else virtual void Recording(const cDevice *Device, const char *Name); virtual void Replaying(const cControl *DvbPlayerControl, const char *Name); +#endif virtual void SetVolume(int Volume, bool Absolute); virtual void OsdClear(void); virtual void OsdTitle(const char *Title); @@ -79,22 +84,36 @@ } } +#if VDRVERSNUM >= 10338 +void cLcdFeed::Recording(const cDevice *Device, const char *Name, const char *FileName, bool On) +{ + //syslog(LOG_INFO, "lcdproc: cLcdFeed::Recording %d %s", Device->CardIndex(), Name); + if (On) +#else void cLcdFeed::Recording(const cDevice *Device, const char *Name) { //syslog(LOG_INFO, "lcdproc: cLcdFeed::Recording %d %s", Device->CardIndex(), Name); if (Name) +#endif LCDproc->SetCardStat(Device->CardIndex(),2); else LCDproc->SetCardStat(Device->CardIndex(),1); } +#if VDRVERSNUM >= 10338 +void cLcdFeed::Replaying(const cControl *DvbPlayerControl, const char *Name, const char *FileName, bool On) +{ + //syslog(LOG_INFO, "lcdproc: cLcdFeed::Replaying %s", Name); + replaymode=On; +#else void cLcdFeed::Replaying(const cControl *DvbPlayerControl, const char *Name) { //syslog(LOG_INFO, "lcdproc: cLcdFeed::Replaying %s", Name); replaymode=(Name)?true:false; +#endif if ( replaymode ) { LCDproc->SetReplayDevice( (cDvbPlayerControl *) DvbPlayerControl); - LCDproc->SetMain(2, Name); + LCDproc->SetMain(2, Name ? Name : ""); LCDproc->SetThreadState( (cLcd::ThreadStates) 2); // Replaying } else { LCDproc->SetReplayDevice(NULL);