X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftracksedit.C;h=7f46fcb228d10ed4a7c50d3ae9de87d12fd5fbaf;hp=5bda1f02f146ee862290a2c397ab59dcace39ec1;hb=9b18af02dc4ccbf052ef9d70180a3d16c0f9848b;hpb=6050493632cb3681227b7ec8c12decd449dcf66f

diff --git a/cinelerra-5.1/cinelerra/tracksedit.C b/cinelerra-5.1/cinelerra/tracksedit.C
index 5bda1f02..7f46fcb2 100644
--- a/cinelerra-5.1/cinelerra/tracksedit.C
+++ b/cinelerra-5.1/cinelerra/tracksedit.C
@@ -120,6 +120,33 @@ void Tracks::clear_transitions(double start, double end)
 	}
 }
 
+int Tracks::clear_hard_edges(double start, double end)
+{
+	for( Track *track=first; track; track=track->next ) {
+		if( !track->record ) continue;
+		int64_t start_units = track->to_units(start, 0);
+		int64_t end_units = track->to_units(end, 0);
+
+		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+			int64_t pos = edit->startproject;
+			if( pos > end_units ) break;
+			if( pos >= start_units ) {
+				edit->hard_left = 0;
+				if( edit->previous )
+					edit->previous->hard_right = 0;
+			}
+			pos += edit->length;
+			if( pos > end_units ) break;
+			if( pos >= start_units ) {
+				edit->hard_right = 0;
+				if( edit->next )
+					edit->next->hard_left = 0;
+			}
+		}
+	}
+	return 0;
+}
+
 void Tracks::shuffle_edits(double start, double end)
 {
 // This doesn't affect automation or effects
@@ -155,19 +182,17 @@ void Tracks::reverse_edits(double start, double end)
 		}
 	}
 }
+
 void Tracks::align_edits(double start, double end)
 {
 // This doesn't affect automation or effects
-	ArrayList<double> times;
-
-	for(Track *current_track = first;
-		current_track;
-		current_track = current_track->next)
-	{
-		if(current_track->record)
-		{
-			current_track->align_edits(start, end, &times);
-		}
+	Track *master_track = 0;
+	for( Track *track=first; track; track=track->next ) {
+		if( !track->record ) continue;
+		if( !master_track )
+			master_track = track;
+		else
+			track->align_edits(start, end, master_track);
 	}
 }
 
@@ -851,24 +876,15 @@ int Tracks::move_track_down(Track *track)
 
 int Tracks::move_tracks_up()
 {
-	Track *track, *next_track;
 	int result = 0;
-
-	for(track = first;
-		track;
-		track = next_track)
-	{
-		next_track = track->next;
-
-		if(track->record)
-		{
-			if(track->previous)
-			{
-				change_modules(number_of(track->previous), number_of(track), 1);
-
-				swap(track->previous, track);
-				result = 1;
-			}
+	Track *next = first;
+	while( next ) {
+		Track *track = next;  next = track->next;
+		if( !track->record ) continue;
+		if( track->previous ) {
+			change_modules(number_of(track->previous), number_of(track), 1);
+			swap(track->previous, track);
+			result = 1;
 		}
 	}
 
@@ -877,24 +893,15 @@ int Tracks::move_tracks_up()
 
 int Tracks::move_tracks_down()
 {
-	Track *track, *previous_track;
 	int result = 0;
-
-	for(track = last;
-		track;
-		track = previous_track)
-	{
-		previous_track = track->previous;
-
-		if(track->record)
-		{
-			if(track->next)
-			{
-				change_modules(number_of(track), number_of(track->next), 1);
-
-				swap(track, track->next);
-				result = 1;
-			}
+	Track *prev = last;
+	while( prev ) {
+		Track *track = prev;  prev = track->previous;
+		if( !track->record ) continue;
+		if( track->next ) {
+			change_modules(number_of(track), number_of(track->next), 1);
+			swap(track, track->next);
+			result = 1;
 		}
 	}
 
@@ -902,7 +909,6 @@ int Tracks::move_tracks_down()
 }
 
 
-
 void Tracks::paste_audio_transition(PluginServer *server)
 {
 	for(Track *current = first; current; current = NEXT)