[vdr] 06/11: Dropped opt-22-x_edit_marks.patch

[Tobias Grimm]

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

tiber-guest pushed a commit to branch e-tobi
in repository vdr.

commit 76ddc16f3e2f1eb40c5bfe297bb5915319c7f35f
Author: etobi <git at e-tobi.net>
Date:   Sat Feb 7 14:00:20 2015 +0100

    Dropped opt-22-x_edit_marks.patch
---
 debian/changelog                         |  1 +
 debian/patches/opt-22-x_edit_marks.patch | 57 --------------------------------
 debian/patches/series                    |  3 --
 3 files changed, 1 insertion(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c56b50d..b34db5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 vdr (2.1.8-1~etobi1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Dropped opt-22-x_edit_marks.patch
 
  -- Tobias Grimm <etobi at debian.org>  Sat, 07 Feb 2015 11:15:37 +0100
 
diff --git a/debian/patches/opt-22-x_edit_marks.patch b/debian/patches/opt-22-x_edit_marks.patch
deleted file mode 100644
index fef7346..0000000
--- a/debian/patches/opt-22-x_edit_marks.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: Patch adds keys '1', '3' in replay mode to move marks by +/-5secs.
-             If the next mark is nearer than 5secs, move the mark on the same position.
-Author: FrankJepsen at vdrportal.de
-Origin: http://vdrportal.de/board/thread.php?postid=718583#post718583
-
-Index: vdr/menu.c
-===================================================================
---- vdr.orig/menu.c	2015-02-07 11:23:12.624741872 +0100
-+++ vdr/menu.c	2015-02-07 11:23:12.624741872 +0100
-@@ -5493,10 +5493,47 @@
-                    Stop();
-                    return osEnd;
-     default: {
-+      bool play, forward;
-+      int speed;
-+      int Current, Total;
-+      cMark *m;
-+
-       DoShowMode = false;
-       switch (int(Key)) {
-         // Editing:
-         case kMarkToggle:      MarkToggle(); break;
-+        case k1|k_Repeat:
-+        case k1:               if (GetReplayMode(play, forward, speed) && !play && GetIndex(Current, Total) && (m = marks.Get(Current)) != NULL) {
-+                                  displayFrames = true;
-+                                  int p = SkipFrames(-SecondsToFrames(5, FramesPerSecond()));
-+                                  cMark *m2;
-+                                  while ((m2 = marks.Prev(m)) != NULL && m2->Position() == m->Position())
-+                                        m = m2;
-+                                  if ((m2 = marks.Prev(m)) != NULL && m2->Position() > p)
-+                                     p = m2->Position();
-+                                  m->SetPosition(p);
-+                                  Goto(m->Position(), true);
-+                                  marksModified = true;
-+                                  }
-+                               else
-+                                  SkipSeconds(-20);
-+                               break;
-+        case k3|k_Repeat:
-+        case k3:               if (GetReplayMode(play, forward, speed) && !play && GetIndex(Current, Total) && (m = marks.Get(Current)) != NULL) {
-+                                  displayFrames = true;
-+                                  int p = SkipFrames(SecondsToFrames(5, FramesPerSecond()));
-+                                  cMark *m2;
-+                                  while ((m2 = marks.Next(m)) != NULL && m2->Position() == m->Position())
-+                                        m = m2;
-+                                  if ((m2 = marks.Next(m)) != NULL && m2->Position() < p)
-+                                     p = m2->Position();
-+                                  m->SetPosition(p);
-+                                  Goto(m->Position(), true);
-+                                  marksModified = true;
-+                                  }
-+                               else
-+                                  SkipSeconds(20);
-+                               break;
-         case kPrev|k_Repeat:
-         case kPrev:
-         case kMarkJumpBack|k_Repeat:
diff --git a/debian/patches/series b/debian/patches/series
index afd386d..cfc095b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,9 +4,6 @@
 
 99_ncursesw-include.patch
 
-# Move cut mark 10 seconds with 1/3 and stop playback when toggeling cut mark
-opt-22-x_edit_marks.patch
-
 # Patch needed for the ttxtsubs plugin.
 opt-27_ttxtsubs.patch
 

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