frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed asserting free disk space in the cutter

Browse Source
This commit is contained in:
Klaus Schmidinger 2013-08-21 13:46:13 +02:00
parent cd53d57779
commit acdfbb5aad
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -7812,3 +7812,7 @@ Video Disk Recorder Revision History
by Stefan Braun). by Stefan Braun).
- Fixed a crash in the LCARS skin's main menu in case there is no current channel - Fixed a crash in the LCARS skin's main menu in case there is no current channel
(reported by Dominique Dumont). (reported by Dominique Dumont).
2013-08-21: Version 2.0.3
- Fixed asserting free disk space in the cutter.

6
config.h
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: config.h 2.76.1.2 2013/04/27 10:18:08 kls Exp $ * $Id: config.h 2.76.1.3 2013/08/21 13:44:59 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -22,8 +22,8 @@
// VDR's own version number: // VDR's own version number:
#define VDRVERSION "2.0.2" #define VDRVERSION "2.0.3"
#define VDRVERSNUM 20002 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 20003 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number: // The plugin API's version number:

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 2.25.1.1 2013/05/02 09:21:18 kls Exp $ * $Id: cutter.c 2.25.1.2 2013/08/21 13:43:46 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: