[SCM] vdr packaging repository branch, e-tobi, updated. debian/2.0.0-1_etobi2-1-g9ff4ec0

[etobi]

The following commit has been merged in the e-tobi branch:
commit 9ff4ec039c328d1583e35a988b0a5303bcb25c61
Author: etobi <git at e-tobi.net>
Date:   Tue Apr 2 21:33:13 2013 +0200

    Added opt-22-x_edit_marks.patch again

diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 91fcb39..f04c1d7 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -7,4 +7,5 @@ debian/patches/opt-42-x_MainMenuHooks.patch:ef26bc79d45a2d32a3cb7b1589e9b652
 debian/patches/06_default_svdrp_port_0.patch:bb49194133b0487b1efe5619930d7af0
 debian/patches/opt-50_graphtft.patch:10a8dfc931180dfc13cf14e4f080b874
 debian/patches/opt-37-x_menuorg.patch:6dcb9013c5e2bf7d800d9c3b23b97c42
+debian/patches/opt-22-x_edit_marks.patch:29794d91fd06559eaea8970d43689af7
 debian/patches/99_ncursesw-include.patch:9312525e87bdbb7181329cf7ff6c9c0c
diff --git a/debian/changelog b/debian/changelog
index 2fd7f4a..5e04dd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr (2.0.0-1~etobi3) unstable; urgency=low
+
+  * Added opt-22-x_edit_marks.patch again
+
+ -- Tobias Grimm <etobi at debian.org>  Tue, 02 Apr 2013 21:33:01 +0200
+
 vdr (2.0.0-1~etobi2) unstable; urgency=low
 
   * Added new config option ENABLE_CORE_DUMPS in /etc/default/vdr
diff --git a/debian/patches/opt-22-x_edit_marks.patch b/debian/patches/opt-22-x_edit_marks.patch
new file mode 100644
index 0000000..794cf0f
--- /dev/null
+++ b/debian/patches/opt-22-x_edit_marks.patch
@@ -0,0 +1,58 @@
+Description: Patch adds keys '1', '3' in replay mode to move marks by +/-5secs.
+ When in replay mode key '0' sets a mark and stops there.
+ 'Green' and 'Yellow' act as 'Prev' and 'Next'.
+Author: FrankJepsen at vdrportal.de
+Origin: http://vdrportal.de/board/thread.php?postid=718583#post718583
+
+Index: vdr/menu.c
+===================================================================
+--- vdr.orig/menu.c	2013-04-02 21:42:30.000000000 +0200
++++ vdr/menu.c	2013-04-02 21:45:11.000000000 +0200
+@@ -4939,10 +4939,46 @@
+                    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 kMarkToggle:      if (GetReplayMode(play, forward, speed) && play) {
++                                  displayFrames = true;
++                                  Pause();
++                                  }
++                               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;
++                                  if ((m2 = marks.Prev(m)) != NULL && m2->Position() >= p)
++                                     break;
++                                  m->SetPosition(p); Goto(p, true);
++                                  marks.Save();
++                                  }
++                               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;
++                                  if ((m2 = marks.Next(m)) != NULL && m2->Position() <= p)
++                                     break;
++                                  m->SetPosition(p); Goto(p, true);
++                                  marks.Save();
++                                  }
++                               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 cfc095b..afd386d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,9 @@
 
 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
 

-- 
vdr packaging repository