[SCM] vdr packaging repository branch, e-tobi, updated. debian/2.0.1-1_etobi1-1-gd1ff96e

[Thomas Günther]

The following commit has been merged in the e-tobi branch:
commit d1ff96e730cc8fab595c16df0741a61161ec7043
Author: Thomas Günther <tom at toms-cafe.de>
Date:   Sun Apr 21 18:08:05 2013 +0200

    Fixed and improved opt-22-x_edit_marks.patch

diff --git a/debian/changelog b/debian/changelog
index caa6769..849e81b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr (2.0.1-1~etobi2) UNRELEASED; urgency=low
+
+  * Fixed and improved opt-22-x_edit_marks.patch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 21 Apr 2013 17:45:43 +0200
+
 vdr (2.0.1-1~etobi1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/opt-22-x_edit_marks.patch b/debian/patches/opt-22-x_edit_marks.patch
index 794cf0f..9bdae3e 100644
--- a/debian/patches/opt-22-x_edit_marks.patch
+++ b/debian/patches/opt-22-x_edit_marks.patch
@@ -1,14 +1,13 @@
 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'.
+             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	2013-04-02 21:42:30.000000000 +0200
-+++ vdr/menu.c	2013-04-02 21:45:11.000000000 +0200
-@@ -4939,10 +4939,46 @@
+diff --git a/menu.c b/menu.c
+index 31d25d0..2ed9652 100644
+--- a/menu.c
++++ b/menu.c
+@@ -4939,10 +4939,47 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
                     Stop();
                     return osEnd;
      default: {
@@ -20,22 +19,19 @@ Index: vdr/menu.c
        DoShowMode = false;
        switch (int(Key)) {
          // Editing:
--        case kMarkToggle:      MarkToggle(); break;
-+        case kMarkToggle:      if (GetReplayMode(play, forward, speed) && play) {
-+                                  displayFrames = true;
-+                                  Pause();
-+                                  }
-+                               MarkToggle();
-+                               break;
+         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;
-+                                  if ((m2 = marks.Prev(m)) != NULL && m2->Position() >= p)
-+                                     break;
-+                                  m->SetPosition(p); Goto(p, true);
-+                                  marks.Save();
++                                  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);
@@ -45,10 +41,13 @@ Index: vdr/menu.c
 +                                  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();
++                                  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);

-- 
vdr packaging repository