summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY9
-rw-r--r--menu.c4
2 files changed, 7 insertions, 6 deletions
diff --git a/HISTORY b/HISTORY
index 97f6f907..92d140c3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8414,7 +8414,7 @@ Video Disk Recorder Revision History
generated an index file with VDR version 2.0.6 you may want to do so again with this
version to make sure the index is OK.
-2015-01-30: Version 2.1.8
+2015-01-31: Version 2.1.8
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed "warning: invalid suffix on literal" with GCC 4.8 and C++11 (thanks to Joerg
@@ -8431,9 +8431,10 @@ Video Disk Recorder Revision History
the recording.
+ The new option "Setup/Replay/Pause replay at last mark" can be used to make replay
go into Pause mode when it has reached the last "end" mark.
- + The '8' key for testing an edited sequence now always jumps to the next *end*
- mark. This allows for testing edits in recordings that have actually been cut, as
- well as recordings that have not been cut, in case "Skip edited parts" is enabled.
+ + The '8' key for testing an edited sequence now also jumps to the next *end*
+ mark if "Setup/Replay/Skip edited parts" is active. This allows for testing edits
+ in recordings that have actually been cut, as well as recordings that have not
+ been cut, in case "Skip edited parts" is enabled.
- Added support for "Satellite Channel Routing" (SCR) according to EN50607, also
known as "JESS" (thanks to Manfred Völkel and Frank Neumann).
- The keys '1' and '3' can now be used in replay mode to position an editing mark
diff --git a/menu.c b/menu.c
index f20ff051..5e8899ff 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 3.32 2015/01/30 12:27:37 kls Exp $
+ * $Id: menu.c 3.33 2015/01/31 11:36:08 kls Exp $
*/
#include "menu.h"
@@ -5415,7 +5415,7 @@ void cReplayControl::EditTest(void)
if (!m)
m = marks.GetNext(Current);
if (m) {
- if ((m->Index() & 0x01) == 0) // this is a "start" mark, so get the next "end" mark
+ if ((m->Index() & 0x01) != 0 && !Setup.SkipEdited) // when skipping edited parts we also need to jump to end marks
m = marks.Next(m);
if (m) {
Goto(m->Position() - SecondsToFrames(3, FramesPerSecond()));