mirror of
				https://github.com/vdr-projects/vdr.git
				synced 2025-03-01 10:50:46 +00:00 
			
		
		
		
	Fixed asserting free disk space in the cutter
This commit is contained in:
		
							
								
								
									
										1
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								HISTORY
									
									
									
									
									
								
							@@ -7868,3 +7868,4 @@ Video Disk Recorder Revision History
 | 
			
		||||
    dish has reached its target position. Parsing SI data is paused until the target
 | 
			
		||||
    position has been reached.
 | 
			
		||||
- 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
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								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 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"
 | 
			
		||||
@@ -556,6 +556,8 @@ bool cCuttingThread::ProcessSequence(int LastEndIndex, int BeginIndex, int EndIn
 | 
			
		||||
      bool Independent;
 | 
			
		||||
      int Length;
 | 
			
		||||
      if (LoadFrame(Index, Buffer, Independent, Length)) {
 | 
			
		||||
         // Make sure there is enough disk space:
 | 
			
		||||
         AssertFreeDiskSpace(-1);
 | 
			
		||||
         bool CutIn = !SeamlessBegin && Index == BeginIndex;
 | 
			
		||||
         bool CutOut = !SeamlessEnd && Index == EndIndex - 1;
 | 
			
		||||
         bool DeletedFrame = false;
 | 
			
		||||
@@ -608,8 +610,6 @@ void cCuttingThread::Action(void)
 | 
			
		||||
              cCondWait::SleepMs(100);
 | 
			
		||||
              continue;
 | 
			
		||||
              }
 | 
			
		||||
           // Make sure there is enough disk space:
 | 
			
		||||
           AssertFreeDiskSpace(-1);
 | 
			
		||||
           // Determine the actual begin and end marks, skipping any marks at the same position:
 | 
			
		||||
           cMark *EndMark = fromMarks.GetNextEnd(BeginMark);
 | 
			
		||||
           // Process the current sequence:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user