[vdr-ttxtsubs] Adapt to VDR 1.7.26.

[Ville Skyttä]

commit 6331ec82a8101de5e0f124ada73ffcbb228643ae
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Mar 11 19:53:41 2012 +0200

    Adapt to VDR 1.7.26.

 0001-Adapt-to-VDR-1.7.26-API-changes.patch |   49 ++++++++++++++++++++++++++++
 vdr-ttxtsubs.spec                          |    7 +++-
 2 files changed, 55 insertions(+), 1 deletions(-)
---
diff --git a/0001-Adapt-to-VDR-1.7.26-API-changes.patch b/0001-Adapt-to-VDR-1.7.26-API-changes.patch
new file mode 100644
index 0000000..723dfe8
--- /dev/null
+++ b/0001-Adapt-to-VDR-1.7.26-API-changes.patch
@@ -0,0 +1,49 @@
+From ffcb38b9f770dd214ed5e5b45f6f5825a55b906c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Sun, 11 Mar 2012 19:32:14 +0200
+Subject: [PATCH] Adapt to VDR 1.7.26 API changes.
+
+---
+ ttxtsubs.c |   17 ++++++++++++++---
+ 1 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/ttxtsubs.c b/ttxtsubs.c
+index 9781a26..e03ad16 100644
+--- a/ttxtsubs.c
++++ b/ttxtsubs.c
+@@ -136,7 +136,11 @@ public:
+ 
+   // -- cStatus
+  protected:
+-  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
++  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber
++#if APIVERSNUM >= 10726
++			     , bool LiveView
++#endif
++			     );
+   virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On);
+   //  virtual void OsdClear(void) { ShowTtxt(); }
+   //  virtual void OsdTitle(const char *Title) { HideTtxt(); }
+@@ -328,10 +332,17 @@ bool cPluginTtxtsubs::SetupParse(const char *Name, const char *Value)
+   return true;
+ }
+ 
+-void cPluginTtxtsubs::ChannelSwitch(const cDevice *Device, int ChannelNumber)
++void cPluginTtxtsubs::ChannelSwitch(const cDevice *Device, int ChannelNumber
++#if APIVERSNUM >= 10726
++				    , bool LiveView
++#endif
++				    )
+ {
++#if APIVERSNUM < 10726
++  bool LiveView = Device->IsPrimaryDevice();
++#endif
+   //dprint("cPluginTtxtsubs::ChannelSwitch(devicenr: %d, channelnr: %d) - mDispl: %x\n",  Device->DeviceNumber(), ChannelNumber, mDispl); // XXX
+-  if (Device->IsPrimaryDevice() && !Device->Replaying() && ChannelNumber)
++  if (LiveView && !Device->Replaying() && ChannelNumber)
+   {
+     StopTtxt();
+     DELETENULL(mLiveReceiver);
+-- 
+1.7.7.6
+
diff --git a/vdr-ttxtsubs.spec b/vdr-ttxtsubs.spec
index f63f690..f82c461 100644
--- a/vdr-ttxtsubs.spec
+++ b/vdr-ttxtsubs.spec
@@ -3,13 +3,14 @@
 
 Name:           vdr-%{pname}
 Version:        0.2.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Teletext subtitles plugin for VDR
 
 License:        GPLv2+
 URL:            http://projects.vdr-developer.org/projects/show/plg-ttxtsubs
 Source0:        http://projects.vdr-developer.org/attachments/download/725/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
+Patch0:         0001-Adapt-to-VDR-1.7.26-API-changes.patch
 
 BuildRequires:  vdr-devel >= 1.7.6
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
@@ -21,6 +22,7 @@ teletext based subtitles using the on screen display.
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)/include||' Makefile
 f=HISTORY ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
 sed -i -e 's|ConfigDirectory("ttxtsubs")|"%{vdr_vardir}/%{pname}"|' \
@@ -59,6 +61,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Sun Mar 11 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-8
+- Adapt to VDR 1.7.26.
+
 * Sun Mar 11 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-7
 - Rebuild.