frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed setting the start time of an edited recording

This commit is contained in:
Klaus Schmidinger 2011-10-09 16:12:21 +02:00
parent 583f840990
commit ae8627e6fc
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -2248,6 +2248,7 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
for reporting that Setup.InitialChannel was dereferenced without checking for NULL for reporting that Setup.InitialChannel was dereferenced without checking for NULL
for suggesting to implement a function to determine the length of a recording's for suggesting to implement a function to determine the length of a recording's
index file index file
for fixing setting the start time of an edited recording
Pekka Mauno <pekka.mauno@iki.fi> Pekka Mauno <pekka.mauno@iki.fi>
for fixing cSchedule::GetFollowingEvent() in case there is currently no present for fixing cSchedule::GetFollowingEvent() in case there is currently no present

3
HISTORY
View File

@ -6743,7 +6743,7 @@ Video Disk Recorder Revision History
extends over TS packet boundaries is now done by locally skipping TS packets extends over TS packet boundaries is now done by locally skipping TS packets
in cFrameDetector. in cFrameDetector.
2011-09-23: Version 1.7.22 2011-10-09: Version 1.7.22
- Fixed scaling subtitles in case the primary device's GetVideoSize() function doesn't - Fixed scaling subtitles in case the primary device's GetVideoSize() function doesn't
return actual values (thanks to Luca Olivetti). return actual values (thanks to Luca Olivetti).
@ -6761,3 +6761,4 @@ Video Disk Recorder Revision History
- Fixed handling DVB subtitles and implemented decoding textual DVB subtitles (thanks - Fixed handling DVB subtitles and implemented decoding textual DVB subtitles (thanks
to Rolf Ahrenberg). to Rolf Ahrenberg).
- Added cap_net_raw to the capabilities that are not dropped (thanks to Dominic Evans). - Added cap_net_raw to the capabilities that are not dropped (thanks to Dominic Evans).
- Fixed setting the start time of an edited recording (thanks to Christoph Haubrich).

4
cutter.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: cutter.c 2.8 2011/08/21 11:08:08 kls Exp $ * $Id: cutter.c 2.9 2011/10/09 16:09:58 kls Exp $
*/ */
#include "cutter.h" #include "cutter.h"
@ -210,7 +210,7 @@ bool cCutter::Start(const char *FileName)
cRecording Recording(FileName); cRecording Recording(FileName);
cMarks FromMarks; cMarks FromMarks;
FromMarks.Load(FileName); FromMarks.Load(FileName, Recording.FramesPerSecond(), Recording.IsPesRecording());
if (cMark *First = FromMarks.First()) if (cMark *First = FromMarks.First())
Recording.SetStartTime(Recording.Start() + (int(First->Position() / Recording.FramesPerSecond() + 30) / 60) * 60); Recording.SetStartTime(Recording.Start() + (int(First->Position() / Recording.FramesPerSecond() + 30) / 60) * 60);