mirror of
				https://github.com/vdr-projects/vdr.git
				synced 2025-03-01 10:50:46 +00:00 
			
		
		
		
	Fixed no longer generating any editing marks if the edited recording results in just one single sequence
This commit is contained in:
		| @@ -2602,6 +2602,8 @@ Halim Sahin <halim.sahin@t-online.de> | ||||
|  for suggesting to make the "Source" item in the "Edit channel" menu wrap around the | ||||
|  list of sources | ||||
|  for reporting a crash when creating a new channel if the channel list is empty | ||||
|  for reporting that editing marks were generated even if the edited recording resulted | ||||
|  in just one single sequence | ||||
|  | ||||
| Denis Knauf <denis.knauf@gmail.com> | ||||
|  for reporting a missing '-' at the next to last line of SVDRP help texts | ||||
|   | ||||
							
								
								
									
										6
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								HISTORY
									
									
									
									
									
								
							| @@ -7328,7 +7328,7 @@ Video Disk Recorder Revision History | ||||
|   + no longer generating an editing mark at the "end" of the edited recording (this | ||||
|     was actually generated at the beginning of the last GOP, so that a subsequent | ||||
|     edit would have cut off the last GOP) | ||||
|   + no longer generating any editing marks if the edited recording results on just | ||||
|   + no longer generating any editing marks if the edited recording results in just | ||||
|     one single sequence | ||||
|   + ignoring pairs of editing marks that are placed at exactly the same position of | ||||
|     a recording when actually cutting the recording | ||||
| @@ -7806,7 +7806,7 @@ Video Disk Recorder Revision History | ||||
| - Fixed displaying the frame number when setting an editing mark (thanks to Thomas | ||||
|   G<>nther). | ||||
|  | ||||
| 2013-04-27: Version 2.1.1 | ||||
| 2013-05-02: Version 2.1.1 | ||||
|  | ||||
| - Fixed initializing cDevice::keepTracks. | ||||
| - Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than | ||||
| @@ -7829,3 +7829,5 @@ Video Disk Recorder Revision History | ||||
|   characters" in version 1.7.36). | ||||
| - Fixed displaying the frame number when setting an editing mark (thanks to Thomas | ||||
|   G<>nther). | ||||
| - Fixed no longer generating any editing marks if the edited recording results in just | ||||
|   one single sequence (reported by Halim Sahin). | ||||
|   | ||||
							
								
								
									
										4
									
								
								cutter.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								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 2.25 2013/03/18 09:40:49 kls Exp $ | ||||
|  * $Id: cutter.c 3.1 2013/05/02 09:09:21 kls Exp $ | ||||
|  */ | ||||
|  | ||||
| #include "cutter.h" | ||||
| @@ -581,7 +581,7 @@ bool cCuttingThread::ProcessSequence(int LastEndIndex, int BeginIndex, int EndIn | ||||
|             } | ||||
|          fileSize += Length; | ||||
|          // Generate marks at the editing points in the edited recording: | ||||
|          if (numSequences > 0 && Index == BeginIndex) { | ||||
|          if (numSequences > 1 && Index == BeginIndex) { | ||||
|             if (toMarks.Count() > 0) | ||||
|                toMarks.Add(toIndex->Last()); | ||||
|             toMarks.Add(toIndex->Last()); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user