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

Fixed asserting free disk space in the cutter

This commit is contained in:
Klaus Schmidinger 2013-08-21 13:22:19 +02:00
parent cd10b439d0
commit 7a359a958e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -7868,3 +7868,4 @@ Video Disk Recorder Revision History
dish has reached its target position. Parsing SI data is paused until the target dish has reached its target position. Parsing SI data is paused until the target
position has been reached. position has been reached.
- The LCARS skin now shows the source value of the current channel in its channel display. - The LCARS skin now shows the source value of the current channel in its channel display.
- Fixed asserting free disk space in the cutter.

6
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 3.1 2013/05/02 09:09:21 kls Exp $ * $Id: cutter.c 3.2 2013/08/21 13:15:24 kls Exp $
*/ */
#include "cutter.h" #include "cutter.h"
@ -556,6 +556,8 @@ bool cCuttingThread::ProcessSequence(int LastEndIndex, int BeginIndex, int EndIn
bool Independent; bool Independent;
int Length; int Length;
if (LoadFrame(Index, Buffer, Independent, Length)) { if (LoadFrame(Index, Buffer, Independent, Length)) {
// Make sure there is enough disk space:
AssertFreeDiskSpace(-1);
bool CutIn = !SeamlessBegin && Index == BeginIndex; bool CutIn = !SeamlessBegin && Index == BeginIndex;
bool CutOut = !SeamlessEnd && Index == EndIndex - 1; bool CutOut = !SeamlessEnd && Index == EndIndex - 1;
bool DeletedFrame = false; bool DeletedFrame = false;
@ -608,8 +610,6 @@ void cCuttingThread::Action(void)
cCondWait::SleepMs(100); cCondWait::SleepMs(100);
continue; continue;
} }
// Make sure there is enough disk space:
AssertFreeDiskSpace(-1);
// Determine the actual begin and end marks, skipping any marks at the same position: // Determine the actual begin and end marks, skipping any marks at the same position:
cMark *EndMark = fromMarks.GetNextEnd(BeginMark); cMark *EndMark = fromMarks.GetNextEnd(BeginMark);
// Process the current sequence: // Process the current sequence: