[vdr-plugin-dvd] 03/03: Added vdr 2.1.x compatibility patch from Lars Hanisch / yaVDR

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

commit 0e6f7945c399f9a622373b810b85da81e483318b
Author: etobi <git at e-tobi.net>
Date:   Mon Feb 16 22:45:07 2015 +0100

    Added vdr 2.1.x compatibility patch from Lars Hanisch / yaVDR
---
 debian/changelog                      |  1 +
 debian/patches/series                 |  1 +
 debian/patches/vdr-2.1.x-compat.patch | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1965465..9314da1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-21) unstable; urgency=medium
 
   * Build-depend on vdr-dev (>= 2.1.10)
   * Standards-Version: 3.9.6
+  * Added vdr 2.1.x compatibility patch from Lars Hanisch / yaVDR
 
  -- Tobias Grimm <etobi at debian.org>  Mon, 16 Feb 2015 22:41:23 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 77f5f16..0d6b6f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 11_allow-non-existing-dvd-drive.patch
 12_dvd-fixed-german-spelling.patch
 13_fix-dvdnav-using-c++-keywords.patch
+vdr-2.1.x-compat.patch
diff --git a/debian/patches/vdr-2.1.x-compat.patch b/debian/patches/vdr-2.1.x-compat.patch
new file mode 100644
index 0000000..90ced9d
--- /dev/null
+++ b/debian/patches/vdr-2.1.x-compat.patch
@@ -0,0 +1,28 @@
+--- a/player-dvd.c
++++ b/player-dvd.c
+@@ -264,8 +264,12 @@
+ 
+ // ... in this directory (default: /video)
+ #ifndef RESUMEDIR
++#if APIVERSNUM > 20101
++#define RESUMEDIR cVideoDirectory::Name()
++#else
+ #define RESUMEDIR VideoDirectory
+ #endif
++#endif
+ 
+ 
+ // borrowed from the mplayer plugin code and adapted to the dvd resume requirements
+@@ -592,8 +596,11 @@
+ 	        if (playMode == pmSlow)
+                 sp=2;
+         }
++#if APIVERSNUM > 20103
++        DeviceTrickSpeed(sp, true);
++#else
+         DeviceTrickSpeed(sp);
+-
++#endif
+     } else if ( nts>0 && nts-NORMAL_SPEED <= MAX_MAX_SPEEDS ) {
+         fastWindFactor  = 1;
+         trickSpeed = nts;

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