From c2f88fbbb397f18723e42893963d383ac7f82d88 Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Sun, 4 Sep 2011 17:58:18 +0300
Subject: [PATCH] Updated for vdr-1.7.21.

---
 HISTORY                                  |  2 +-
 device.c                                 |  5 +++++
 device.h                                 |  1 +
 iptv.c                                   |  4 ++--
 patches/vdr-1.7.20-disable_eitscan.patch | 12 ------------
 5 files changed, 9 insertions(+), 15 deletions(-)
 delete mode 100644 patches/vdr-1.7.20-disable_eitscan.patch

diff --git a/HISTORY b/HISTORY
index a9541ed..6ffb6ce 100644
--- a/HISTORY
+++ b/HISTORY
@@ -144,7 +144,7 @@ VDR Plugin 'iptv' Revision History
 
 2010-xx-xx: Version 0.4.3
 
-- Updated for vdr-1.7.16.
+- Updated for vdr-1.7.21.
 - Renamed Sid scanner to section id scanner and added
   experimental Tid/Nid support into it.
 - Added optional source address validation for UDP protocol.
diff --git a/device.c b/device.c
index c9c8ab0..59a2b20 100644
--- a/device.c
+++ b/device.c
@@ -216,6 +216,11 @@ bool cIptvDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *N
   return result;
 }
 
+bool cIptvDevice::ProvidesEIT(void) const
+{
+  return false;
+}
+
 int cIptvDevice::NumProvidedSystems(void) const
 {
   return 1;
diff --git a/device.h b/device.h
index 5bc9b97..91533dd 100644
--- a/device.h
+++ b/device.h
@@ -84,6 +84,7 @@ public:
   virtual bool ProvidesSource(int Source) const;
   virtual bool ProvidesTransponder(const cChannel *Channel) const;
   virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL) const;
+  virtual bool ProvidesEIT(void) const;
   virtual int NumProvidedSystems(void) const;
 protected:
   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
diff --git a/iptv.c b/iptv.c
index ec9c0d5..771cba4 100644
--- a/iptv.c
+++ b/iptv.c
@@ -12,8 +12,8 @@
 #include "setup.h"
 #include "device.h"
 
-#if defined(APIVERSNUM) && APIVERSNUM < 10719
-#error "VDR-1.7.19 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10721
+#error "VDR-1.7.21 API version or greater is required!"
 #endif
 
        const char VERSION[]     = "0.4.3";
diff --git a/patches/vdr-1.7.20-disable_eitscan.patch b/patches/vdr-1.7.20-disable_eitscan.patch
deleted file mode 100644
index 7c2ea97..0000000
--- a/patches/vdr-1.7.20-disable_eitscan.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru vdr-1.7.20-vanilla/eitscan.c vdr-1.7.20-disable_eitscan/eitscan.c
---- vdr-1.7.20-vanilla/eitscan.c	2011-08-17 08:42:25.000000000 +0300
-+++ vdr-1.7.20-disable_eitscan/eitscan.c	2011-08-20 20:23:59.000000000 +0300
-@@ -146,7 +146,7 @@
-                if (Device) {
-                   for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) {
-                       const cChannel *Channel = ScanData->GetChannel();
--                      if (Channel) {
-+                      if (Channel && !cSource::IsType(Channel->Source(), 'I')) {
-                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
-                             if (Device->ProvidesTransponder(Channel)) {
-                                if (!Device->Receiving()) {