Added support for VDR >= 1.7.26

4 files changed, 16 insertions, 1 deletions

diff --git a/HISTORY b/HISTORY
index 3f7e450..bd2a48d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,12 @@
 VDR Plugin 'infosatepg' Revision History
 ----------------------------------------
+
+2012-10-07: UNRELEASED
+
+- Added support for VDR >= 1.7.26
+  provided by debian patch, thx to
+  Tobias Grimm <etobi@debian.org>
+
 2010-06-06: Version 0.0.11
 
 - Added support for VDR >= 1.7.14
diff --git a/infosatepg.cpp b/infosatepg.cpp
index 916013b..aefbbbc 100644
--- a/infosatepg.cpp
+++ b/infosatepg.cpp
@@ -194,7 +194,7 @@ void cPluginInfosatepg::MainThreadHook(void)
         if (dev)
         {
             if (!dev->ProvidesTransponder(chan)) continue; // device cannot provide transponder -> skip
-            if (EITScanner.UsesDevice(dev)) continue; // EITScanner is updating EPG -> skip
+            if (EITScanner.Active()) continue; // EITScanner is updating EPG -> skip
             if (dev->Receiving()) continue; // device is recording -> skip
             if (dev->IsPrimaryDevice()) continue; // device is primary -> skip
             if (cDevice::ActualDevice()->CardIndex()==i) continue; // device is live viewing -> skip
diff --git a/status.cpp b/status.cpp
index 2af95fe..cd7c332 100644
--- a/status.cpp
+++ b/status.cpp
@@ -21,7 +21,11 @@ cStatusInfosatepg::~cStatusInfosatepg(void)
     if (myFilter) delete myFilter;
 }
 
+#if APIVERSNUM >= 10726
+void cStatusInfosatepg::ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView)
+#else
 void cStatusInfosatepg::ChannelSwitch(const cDevice *Device, int ChannelNumber)
+#endif
 {
     if (!ChannelNumber) return;
     if (!Device) return; // just to be safe
diff --git a/status.h b/status.h
index 9fd7043..cfe11c7 100644
--- a/status.h
+++ b/status.h
@@ -20,7 +20,11 @@ private:
   cDevice *myFilterDevice;
   cGlobalInfosatepg *global;
 protected:
+#if APIVERSNUM >= 10726
+  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView);
+#else
   virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
+#endif
 public:
   cStatusInfosatepg(cGlobalInfosatepg *Global);
   virtual ~cStatusInfosatepg(void);