[vdr-plugin-osdteletext] 05/08: Dropped patches - fixed upstream

[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 a029fb4d5e034b67463483561be981e559357bcf
Author: Tobias Grimm <etobi at debian.org>
Date:   Sun Jan 28 20:33:43 2018 +0100

    Dropped patches - fixed upstream
---
 debian/patches/series                           |  1 -
 debian/patches/vdr-2.3.2-osdteletext-0.9.5.diff | 56 -------------------------
 2 files changed, 57 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c182f5e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index b55640f..0000000
--- a/debian/patches/vdr-2.3.2-osdteletext-0.9.5.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-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