summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2001-09-16 09:35:51 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2001-09-16 09:35:51 +0200
commit24883d3d230de881aff84cbf52ce8323c2cf353c (patch)
treef42807c160fe2319def4030a1ca14b44c6f3860e
parent6ceefaf85f1866e15a90b961cdc589a4fc38b3ae (diff)
downloadvdr-24883d3d230de881aff84cbf52ce8323c2cf353c.tar.gz
vdr-24883d3d230de881aff84cbf52ce8323c2cf353c.tar.bz2
Fixed putting the final editing mark into the edited version's marks file
-rw-r--r--HISTORY3
-rw-r--r--dvbapi.c9
2 files changed, 7 insertions, 5 deletions
diff --git a/HISTORY b/HISTORY
index ff036fad..319e35af 100644
--- a/HISTORY
+++ b/HISTORY
@@ -716,7 +716,7 @@ Video Disk Recorder Revision History
That way every recording will store the actual summary data at the time of
the recording.
-2001-09-15: Version 0.95
+2001-09-16: Version 0.95
- Fixed behaviour in case the shutdown didn't take place (there were many
"next timer event at..." messages in that case).
@@ -751,3 +751,4 @@ Video Disk Recorder Revision History
to Guido Fiala).
- New version of the "Master-Timer" tool (thanks to Matthias Schniedermeyer).
- Better error handling when writing configuration files.
+- Fixed putting the final editing mark into the edited version's marks file.
diff --git a/dvbapi.c b/dvbapi.c
index 86c692b6..4a019cca 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
* DVD support initially written by Andreas Schultz <aschultz@warp10.net>
* based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
*
- * $Id: dvbapi.c 1.121 2001/09/15 14:15:21 kls Exp $
+ * $Id: dvbapi.c 1.122 2001/09/16 09:35:51 kls Exp $
*/
//#define DVDDEBUG 1
@@ -2382,13 +2382,14 @@ void cCuttingBuffer::Action(void)
if (Mark && Index >= Mark->position) {
Mark = fromMarks.Next(Mark);
+ toMarks.Add(LastIFrame);
+ if (Mark)
+ toMarks.Add(toIndex->Last() + 1);
+ toMarks.Save();
if (Mark) {
Index = Mark->position;
Mark = fromMarks.Next(Mark);
CurrentFileNumber = 0; // triggers SetOffset before reading next frame
- toMarks.Add(LastIFrame);
- toMarks.Add(toIndex->Last() + 1);
- toMarks.Save();
}
else
break; // final end mark reached