[vdr-plugin-osdteletext] 01/08: Added VDR 2.3.2 compatibility patch provided by Frank Neuman (Closes: #872490)

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr-plugin-osdteletext.

commit bb715c7a3dc56b43d3e86589f516a68e5b9da75a
Author: Tobias Grimm <etobi at debian.org>
Date:   Sun Jan 28 19:04:40 2018 +0100

    Added VDR 2.3.2 compatibility patch provided by Frank Neuman (Closes: #872490)
---
 debian/patches/series                           |  1 +
 debian/patches/vdr-2.3.2-osdteletext-0.9.5.diff | 56 +++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c182f5e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+vdr-2.3.2-osdteletext-0.9.5.diff
diff --git a/debian/patches/vdr-2.3.2-osdteletext-0.9.5.diff b/debian/patches/vdr-2.3.2-osdteletext-0.9.5.diff
new file mode 100644
index 0000000..b55640f
--- /dev/null
+++ b/debian/patches/vdr-2.3.2-osdteletext-0.9.5.diff
@@ -0,0 +1,56 @@
+Index: b/menu.c
+===================================================================
+--- a/menu.c
++++ b/menu.c
+@@ -73,11 +73,13 @@
+ }
+ 
+ bool TeletextBrowser::CheckIsValidChannel(int number) {
+-   return (Channels.GetByNumber(number) != 0);
++   LOCK_CHANNELS_READ;
++   return (Channels->GetByNumber(number) != 0);
+ }
+ 
+ void TeletextBrowser::ChannelSwitched(int ChannelNumber) {
+-   cChannel *chan=Channels.GetByNumber(ChannelNumber);
++   LOCK_CHANNELS_READ;
++   const cChannel *chan=Channels->GetByNumber(ChannelNumber);
+    
+    if (!chan)
+       return;
+Index: b/txtrecv.c
+===================================================================
+--- a/txtrecv.c
++++ b/txtrecv.c
+@@ -86,7 +86,8 @@
+ 
+    // ignore if channel is invalid (highly unlikely, this will ever
+    // be the case, but defensive coding rules!)
+-   cChannel* newLiveChannel = Channels.GetByNumber(ChannelNumber);
++   LOCK_CHANNELS_READ;
++   const cChannel* newLiveChannel = Channels->GetByNumber(ChannelNumber);
+    if (newLiveChannel == NULL) return;
+ 
+    // ignore non-live-channel-switching
+@@ -147,7 +148,7 @@
+      }
+ }
+ 
+-void cTxtReceiver::Receive(uchar *Data, int Length)
++void cTxtReceiver::Receive(const uchar *Data, int Length)
+ {
+    cFrame *frame=new cFrame(Data, Length);
+    if (!buffer.Put(frame)) {
+Index: b/txtrecv.h
+===================================================================
+--- a/txtrecv.h
++++ b/txtrecv.h
+@@ -56,7 +56,7 @@
+    Storage *storage;
+ protected:
+    virtual void Activate(bool On);
+-   virtual void Receive(uchar *Data, int Length);
++   virtual void Receive(const uchar *Data, int Length);
+    virtual void Action();
+ public:
+    cTxtReceiver(const cChannel* chan, bool storeTopText, Storage* storage);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-osdteletext.git