summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2013-05-02 09:23:21 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2013-05-02 09:23:21 +0200
commit1b1fe2c887c0638c7b5ad13f20024d7b281885b1 (patch)
treea9e5f8e6d5cfa834a4ead86d332db752b702b398
parentfa77b5c2b22e84ab253170875016e946bddf4373 (diff)
downloadvdr-1b1fe2c887c0638c7b5ad13f20024d7b281885b1.tar.gz
vdr-1b1fe2c887c0638c7b5ad13f20024d7b281885b1.tar.bz2
Fixed no longer generating any editing marks if the edited recording results in just one single sequence
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY6
-rw-r--r--cutter.c4
3 files changed, 8 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index aa913748..2b1f8df4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2601,6 +2601,8 @@ Halim Sahin <halim.sahin@t-online.de>
for suggesting to make the "Source" item in the "Edit channel" menu wrap around the
list of sources
for reporting a crash when creating a new channel if the channel list is empty
+ for reporting that editing marks were generated even if the edited recording resulted
+ in just one single sequence
Denis Knauf <denis.knauf@gmail.com>
for reporting a missing '-' at the next to last line of SVDRP help texts
diff --git a/HISTORY b/HISTORY
index 9615e245..46fd8bb6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7328,7 +7328,7 @@ Video Disk Recorder Revision History
+ no longer generating an editing mark at the "end" of the edited recording (this
was actually generated at the beginning of the last GOP, so that a subsequent
edit would have cut off the last GOP)
- + no longer generating any editing marks if the edited recording results on just
+ + no longer generating any editing marks if the edited recording results in just
one single sequence
+ ignoring pairs of editing marks that are placed at exactly the same position of
a recording when actually cutting the recording
@@ -7795,7 +7795,7 @@ Video Disk Recorder Revision History
improve overall performance when an editing process is running (thanks to Jochen
Dolze).
-2013-04-27: Version 2.0.2
+2013-05-02: Version 2.0.2
- Fixed multiple occurrences of the same directory in the recordings list in case there
are directories that only differ in non-alphanumeric characters (was broken by
@@ -7804,3 +7804,5 @@ Video Disk Recorder Revision History
characters" in version 1.7.36).
- Fixed displaying the frame number when setting an editing mark (thanks to Thomas
Günther).
+- Fixed no longer generating any editing marks if the edited recording results in just
+ one single sequence.
diff --git a/cutter.c b/cutter.c
index 05bb0f9f..6e5e662e 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: cutter.c 2.25 2013/03/18 09:40:49 kls Exp $
+ * $Id: cutter.c 2.25.1.1 2013/05/02 09:21:18 kls Exp $
*/
#include "cutter.h"
@@ -581,7 +581,7 @@ bool cCuttingThread::ProcessSequence(int LastEndIndex, int BeginIndex, int EndIn
}
fileSize += Length;
// Generate marks at the editing points in the edited recording:
- if (numSequences > 0 && Index == BeginIndex) {
+ if (numSequences > 1 && Index == BeginIndex) {
if (toMarks.Count() > 0)
toMarks.Add(toIndex->Last());
toMarks.Add(toIndex->Last());