diff -Nur advchctrl-0.0.5.orig/advchctrl.c advchctrl-0.0.5/advchctrl.c --- advchctrl-0.0.5.orig/advchctrl.c 2013-06-07 15:09:21.295900139 +0200 +++ advchctrl-0.0.5/advchctrl.c 2013-06-07 15:01:40.088717367 +0200 @@ -44,7 +44,7 @@ //***** The cStatus Interface Class Implementation **************************************************************************** //extern cAdvChCtrlChannels AdvChCtrlChannelsList; -void cStatusAdvChCtrl::ChannelSwitch (const cDevice *Device, int ChannelNumber) +void cStatusAdvChCtrl::ChannelSwitch (const cDevice *Device, int ChannelNumber, bool LiveView) { isInReplayMode = Device->PrimaryDevice()->Replaying(); // ok in Transfermode we don't want to change the Volume diff -Nur advchctrl-0.0.5.orig/advchctrl.h advchctrl-0.0.5/advchctrl.h --- advchctrl-0.0.5.orig/advchctrl.h 2013-06-07 15:09:21.295900139 +0200 +++ advchctrl-0.0.5/advchctrl.h 2013-06-07 15:02:13.816950505 +0200 @@ -14,7 +14,7 @@ bool isInReplayMode; int ActualVolume; protected: - virtual void ChannelSwitch (const cDevice *Device, int ChannelNumber); + virtual void ChannelSwitch (const cDevice *Device, int ChannelNumber, bool LiveView); virtual void SetVolume (int Volume, bool Absolute); #if VDRVERSNUM >= 10338 virtual void Replaying (const cControl *Control, const char *Name, const char *FileName, bool On); diff -Nur advchctrl-0.0.5.orig/advchctrli18n.h advchctrl-0.0.5/advchctrli18n.h --- advchctrl-0.0.5.orig/advchctrli18n.h 2005-01-11 20:09:40.000000000 +0100 +++ advchctrl-0.0.5/advchctrli18n.h 2013-06-07 15:05:25.342271997 +0200 @@ -9,8 +9,11 @@ #ifndef _I18N__H #define _I18N__H +#include #include - + +#if VDRVERSNUM < 10507 extern const tI18nPhrase Phrases[]; +#endif #endif //_I18N__H diff -Nur advchctrl-0.0.5.orig/advchctrlosd.c advchctrl-0.0.5/advchctrlosd.c --- advchctrl-0.0.5.orig/advchctrlosd.c 2013-06-07 15:09:18.159877640 +0200 +++ advchctrl-0.0.5/advchctrlosd.c 2013-06-07 15:01:50.728791789 +0200 @@ -163,7 +163,7 @@ } } -void cAdvChCtrlOsd::ChannelSwitch(const cDevice * device, int channelNumber) +void cAdvChCtrlOsd::ChannelSwitch(const cDevice * device, int channelNumber, bool LiveView) { DEBUGOSD("%s(%d,%d)\n", __PRETTY_FUNCTION__, device->DeviceNumber(), channelNumber); diff -Nur advchctrl-0.0.5.orig/advchctrlosd.h advchctrl-0.0.5/advchctrlosd.h --- advchctrl-0.0.5.orig/advchctrlosd.h 2005-11-06 18:35:38.000000000 +0100 +++ advchctrl-0.0.5/advchctrlosd.h 2013-06-07 15:00:50.048372446 +0200 @@ -39,7 +39,7 @@ protected: virtual void Action(void); - virtual void ChannelSwitch(const cDevice * device, int channelNumber); + virtual void ChannelSwitch(const cDevice * device, int channelNumber, bool LiveView); //virtual void SetAudioTrack(int Index, const char * const *Tracks); public: diff -Nur advchctrl-0.0.5.orig/Makefile advchctrl-0.0.5/Makefile --- advchctrl-0.0.5.orig/Makefile 2013-06-07 15:09:21.295900139 +0200 +++ advchctrl-0.0.5/Makefile 2013-06-07 15:01:19.044572588 +0200 @@ -31,7 +31,7 @@ ### The vrersion number of VDR (taken from VDR's "config.h"): -VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') +APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') ### The name of the distribution archive: @@ -93,7 +93,7 @@ libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ - @cp $@ $(LIBDIR)/$@.$(VDRVERSION) + @cp $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE)