[vdr-plugin-imonlcd] 01/03: Added fix-replay-control-access.patch which hopefully fixes the segfaults with xineliboutput described in #704259

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

commit 015d33210f6761499172ad0f3daadc717a038bd1
Author: etobi <git at e-tobi.net>
Date:   Sun Apr 14 12:36:53 2013 +0200

    Added fix-replay-control-access.patch which hopefully fixes the segfaults with xineliboutput described in #704259
---
 debian/changelog                               |  7 +++
 debian/patches/fix-replay-control-access.patch | 65 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 73 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bbdf156..73f003a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vdr-plugin-imonlcd (1.0.1-3) unstable; urgency=low
+
+  * Added fix-replay-control-access.patch which hopefully fixes the
+    segfaults with xineliboutput described in #704259
+
+ -- Tobias Grimm <etobi at debian.org>  Sun, 14 Apr 2013 12:36:40 +0200
+
 vdr-plugin-imonlcd (1.0.1-2) unstable; urgency=low
 
   * Build-depend on vdr-dev (>= 2.0.0)
diff --git a/debian/patches/fix-replay-control-access.patch b/debian/patches/fix-replay-control-access.patch
new file mode 100644
index 0000000..a93c625
--- /dev/null
+++ b/debian/patches/fix-replay-control-access.patch
@@ -0,0 +1,65 @@
+Index: vdr-plugin-imonlcd/watch.c
+===================================================================
+--- vdr-plugin-imonlcd.orig/watch.c	2012-07-15 15:32:53.000000000 +0200
++++ vdr-plugin-imonlcd/watch.c	2013-04-14 12:33:28.000000000 +0200
+@@ -61,7 +61,6 @@
+   osdItem = NULL;
+   osdMessage = NULL;
+ 
+-  m_pControl = NULL;
+   replayTitle = NULL;
+   replayTitleLast = NULL;
+   replayTime = NULL;
+@@ -593,7 +592,6 @@
+         m_eVideoMode  = eVideoMPG;
+         m_eAudioMode  = eAudioMPG;
+ 
+-        m_pControl = (cControl *) Control;
+         m_eWatchMode = eReplayNormal;
+         if(replayTitle) {
+           delete replayTitle;
+@@ -706,7 +704,6 @@
+     else
+     {
+       m_eWatchMode = eLiveTV;
+-      m_pControl = NULL;
+     }
+ }
+ 
+@@ -715,8 +712,8 @@
+ {
+   bool Play = false, Forward = false;
+   int Speed = -1;
+-	if (m_pControl
+-        && ((cControl *)m_pControl)->GetReplayMode(Play,Forward,Speed))
++	if (cControl::Control()
++        && cControl::Control()->GetReplayMode(Play,Forward,Speed))
+   {
+     // 'Play' tells whether we are playing or pausing, 'Forward' tells whether
+     // we are going forward or backward and 'Speed' is -1 if this is normal
+@@ -740,10 +737,10 @@
+ 
+ bool ciMonWatch::ReplayPosition(int &current, int &total, double& dFrameRate) const
+ {
+-  if (m_pControl && ((cControl *)m_pControl)->GetIndex(current, total, false)) {
++  if (cControl::Control() && cControl::Control()->GetIndex(current, total, false)) {
+     total = (total == 0) ? 1 : total;
+ #if VDRVERSNUM >= 10703
+-    dFrameRate = ((cControl *)m_pControl)->FramesPerSecond();
++    dFrameRate = cControl::Control()->FramesPerSecond();
+ #endif
+     return true;
+   }
+Index: vdr-plugin-imonlcd/watch.h
+===================================================================
+--- vdr-plugin-imonlcd.orig/watch.h	2012-07-15 15:32:53.000000000 +0200
++++ vdr-plugin-imonlcd/watch.h	2013-04-14 12:33:38.000000000 +0200
+@@ -98,8 +98,6 @@
+   unsigned int m_nIconsForceOff;
+   unsigned int m_nIconsForceMask;
+ 
+-  const cControl *m_pControl;
+-
+   tChannelID  chID;
+   tEventID    chEventID;
+   time_t      chPresentTime;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e0305d8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-replay-control-access.patch

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