[vdr-plugin-xine] 02/06: Added vdr-2.1.10 compatibility patch

[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-xine.

commit 150d95aae5fea81b44f14f492641b2a5908bb577
Author: Tobias Grimm <etobi at debian.org>
Date:   Tue Oct 13 21:59:51 2015 +0200

    Added vdr-2.1.10 compatibility patch
---
 debian/patches/series           |  1 +
 debian/patches/vdr-2.1.10.patch | 81 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 306b74e..7d295d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ format-strings.patch
 vdr-1.7.27.patch
 vdr-1.7.33.patch
 vdr-1.7.40.patch
+vdr-2.1.10.patch
diff --git a/debian/patches/vdr-2.1.10.patch b/debian/patches/vdr-2.1.10.patch
new file mode 100644
index 0000000..679bf39
--- /dev/null
+++ b/debian/patches/vdr-2.1.10.patch
@@ -0,0 +1,81 @@
+From fbe79bc4ac2ab0c30fd6d68bb0902514ba653f9a Mon Sep 17 00:00:00 2001
+From: Lars Hanisch <dvb at flensrocker.de>
+Date: Wed, 7 Oct 2015 19:34:43 +0200
+Subject: [PATCH 5/8] vdr-2.1.10
+
+Origin: http://www.vdr-portal.de/board1-news/board101-news-archiv/p1181066-announce-vdr-developer-version-2-1-3/#post1181066
+---
+ xineDevice.c | 9 ++-------
+ xineDevice.h | 3 +--
+ xineOsd.c    | 8 ++++++--
+ 3 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/xineDevice.c b/xineDevice.c
+index f08b61b..9ab77c7 100644
+--- a/xineDevice.c
++++ b/xineDevice.c
+@@ -300,19 +300,14 @@ namespace PluginXine
+ //#endif
+   }
+ 
+-  void cXineDevice::TrickSpeed(int Speed)
+-  {
+-    TrickSpeed(Speed, false);
+-  }
+-
+-  void cXineDevice::TrickSpeed(int Speed, bool IBP)
++  void cXineDevice::TrickSpeed(int Speed, bool Forward)
+   {
+     f = false;
+     ts = Speed;
+ 
+     xfprintf(stderr, "TrickSpeed: %d\n", Speed);
+     m_xineLib.execFuncTrickSpeedMode(lastCmdWasClear);
+-    m_xineLib.execFuncSetSpeed(100.0 / Speed * (IBP ? 12 : 1));
++    m_xineLib.execFuncSetSpeed(100.0 / Speed);
+     m_xineLib.execFuncWait();
+     m_xineLib.freeze(false);
+     m_xineLib.pause(false);
+diff --git a/xineDevice.h b/xineDevice.h
+index 5570e9f..9767019 100644
+--- a/xineDevice.h
++++ b/xineDevice.h
+@@ -50,8 +50,7 @@ namespace PluginXine
+     virtual bool CanReplay(void) const;
+     virtual bool SetPlayMode(ePlayMode PlayMode);
+     virtual bool HasIBPTrickSpeed(void);
+-    virtual void TrickSpeed(int Speed, bool IBP);
+-    virtual void TrickSpeed(int Speed);
++    virtual void TrickSpeed(int Speed, bool Forward);
+     virtual void Clear(void);
+     virtual void Play(void);
+     virtual void Freeze(void);
+diff --git a/xineOsd.c b/xineOsd.c
+index 186aab4..06415ae 100644
+--- a/xineOsd.c
++++ b/xineOsd.c
+@@ -498,7 +498,7 @@ if (!head)
+ }
+       }
+ 
+-      while (cPixmapMemory *pm = RenderPixmaps())
++      while (cPixmapMemory *pm = dynamic_cast<cPixmapMemory*>(RenderPixmaps()))
+       {
+ if (!head)
+ {
+@@ -518,7 +518,11 @@ if (!head)
+ );
+ */
+         m_pRawOsd->Copy(pm, pm->DrawPort().Shifted(-pm->DrawPort().Point()), pm->ViewPort().Point());
+-        delete pm; 
++#if APIVERSNUM >= 20110
++        DestroyPixmap(pm);
++#else
++        delete pm;
++#endif
+       }
+     }
+     else if (m_pRawOsd)
+-- 
+2.5.3
+

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