[vdr-osdteletext] Apply upstream VDR 1.7.26+ patch.

[Ville Skyttä]

commit aefafb0cafe5f1e3e4e608f6a0f652f227471617
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Mar 11 19:04:06 2012 +0200

    Apply upstream VDR 1.7.26+ patch.

 vdr-osdteletext-0.9.1-vdr1726.patch |   54 +++++++++++++++++++++++++++++++++++
 vdr-osdteletext.spec                |    8 ++++-
 2 files changed, 61 insertions(+), 1 deletions(-)
---
diff --git a/vdr-osdteletext-0.9.1-vdr1726.patch b/vdr-osdteletext-0.9.1-vdr1726.patch
new file mode 100644
index 0000000..0d8be99
--- /dev/null
+++ b/vdr-osdteletext-0.9.1-vdr1726.patch
@@ -0,0 +1,54 @@
+diff --git a/txtrecv.c b/txtrecv.c
+index 2321697..3dc89f6 100644
+--- a/txtrecv.c
++++ b/txtrecv.c
+@@ -483,12 +483,19 @@ cTxtStatus::~cTxtStatus()
+     delete receiver;
+ }
+ 
+-void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber)
++void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber
++#if APIVERSNUM >= 10726
++                               , bool LiveView
++#endif
++                               )
+ {
+-#if VDRVERSNUM >= 10725
++#if APIVERSNUM < 10726
++   bool LiveView = Device->IsPrimaryDevice();
++#endif
++#if APIVERSNUM >= 10725
+    // Disconnect receiver if channel is 0, will reconnect to new
+    // receiver after channel change.
+-   if (ChannelNumber == 0 && Device->IsPrimaryDevice())
++   if (LiveView && ChannelNumber == 0)
+       DELETENULL(receiver);
+ #endif
+ 
+@@ -501,8 +508,7 @@ void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber)
+    if (newLiveChannel == NULL) return;
+ 
+    // ignore non-live-channel-switching
+-   if (!Device->IsPrimaryDevice() ||
+-      ChannelNumber != cDevice::CurrentChannel()) return;
++   if (!LiveView || ChannelNumber != cDevice::CurrentChannel()) return;
+ 
+    // live channel was changed
+    // now re-attach the receiver to the new live channel
+diff --git a/txtrecv.h b/txtrecv.h
+index 8e53daa..a111d0d 100644
+--- a/txtrecv.h
++++ b/txtrecv.h
+@@ -176,7 +176,11 @@ private:
+    bool storeTopText;
+    Storage* storage;
+ protected:
+-   virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
++   virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber
++#if APIVERSNUM >= 10726
++                              , bool LiveView
++#endif
++                              );
+ public:
+    cTxtStatus(bool storeTopText, Storage* storage);
+    ~cTxtStatus();
diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec
index 490aadb..bfc3172 100644
--- a/vdr-osdteletext.spec
+++ b/vdr-osdteletext.spec
@@ -3,7 +3,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.9.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        OSD teletext plugin for VDR
 
 License:        GPLv2+
@@ -12,6 +12,8 @@ Source0:        http://projects.vdr-developer.org/attachments/download/658/%{nam
 Source1:        %{name}.conf
 # http://www.linuxtv.org/pipermail/vdr/2012-March/025895.html
 Patch0:         %{name}-0.9.1-vdr1725.patch
+# http://projects.vdr-developer.org/issues/897
+Patch1:         %{name}-0.9.1-vdr1726.patch
 
 BuildRequires:  vdr-devel >= 1.6.0-41
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
@@ -27,6 +29,7 @@ background.
 sed -i -e 's|/var/cache/vdr/vtx|%{vdr_cachedir}/osdteletext|g' \
     osdteletext.c README README.DE txtrecv.c
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -65,6 +68,9 @@ fi
 
 
 %changelog
+* Sun Mar 11 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.9.1-8
+- Apply upstream VDR 1.7.26+ patch.
+
 * Tue Mar  6 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.9.1-7
 - Apply Udo Richter's patch taking advantage of new VDR 1.7.25 features.