diff options
author | Midas <vdrportal_midas@gmx.de> | 2012-05-01 11:03:15 +0200 |
---|---|---|
committer | Midas <vdrportal_midas@gmx.de> | 2012-05-01 11:03:15 +0200 |
commit | dc5b919da3cb3adf310cd75f4ba9254aab8bf534 (patch) | |
tree | 3b4ebd4996dcb6c5f0fa20d1395c5e6d48b71ec3 | |
parent | 6f83d68cff5a944a37a9f12078b9896a35aa591e (diff) | |
download | vdr-plugin-block-dc5b919da3cb3adf310cd75f4ba9254aab8bf534.tar.gz vdr-plugin-block-dc5b919da3cb3adf310cd75f4ba9254aab8bf534.tar.bz2 |
Compatibility: added LiveView to ChannelSwitch if vdr >= 1.7.26
increased dev version.
-rw-r--r-- | block.c | 2 | ||||
-rw-r--r-- | status.c | 9 | ||||
-rw-r--r-- | status.h | 5 |
3 files changed, 14 insertions, 2 deletions
@@ -20,7 +20,7 @@ #include <fstream> using namespace std; -static const char *VERSION = "0.1.2~201204240222dev"; +static const char *VERSION = "0.1.2~201205010137dev"; static const char *DESCRIPTION = trNOOP("Block unwanted shows by EPG title"); static const char *MAINMENUENTRY = trNOOP("(De)Block broadcast"); @@ -14,8 +14,11 @@ cStatusBlock::cStatusBlock(void): cStatus() { } - +#if VDRVERSNUM < 10726 void cStatusBlock::ChannelSwitch(const cDevice *Device, int ChannelNumber) +#else +void cStatusBlock::ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView) +#endif { int current_channel=cDevice::CurrentChannel(); #ifdef LOGGING @@ -49,7 +52,11 @@ void cStatusBlock::ChannelSwitch(const cDevice *Device, int ChannelNumber) } #endif +#if VDRVERSNUM < 10726 if (Device->DeviceNumber()!=cDevice::PrimaryDevice()->DeviceNumber()) +#else + if (!LiveView) +#endif { #ifdef LOGGING dsyslog("plugin-block: Did nothing cause ChannelSwitch not on active livedevice."); @@ -14,7 +14,12 @@ class cStatusBlock : public cStatus { private: protected: +#if VDRVERSNUM < 10726 virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber); +#else + virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView); +#endif + virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On); |