X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedl.C;h=f7cf1b7cf3aad34259e6a4bba102903452f81505;hp=604dff51890a767335bae43b3d2b65a77cbf23f8;hb=2a56d102d9db53017b306f2a61a2382f29a75783;hpb=f27f3030943396a02f563f3767d400939b70fbd8

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index 604dff51..f7cf1b7c 100644
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -795,19 +795,22 @@ int EDL::clear(double start, double end,
 	return 0;
 }
 
+static int dead_edit_cmp(Edit**ap, Edit**bp)
+{
+	Edit *a = *ap, *b = *bp;
+	if( a->track != b->track ) return 0;
+	return a->startproject > b->startproject ? -1 : 1;
+}
+
 void EDL::delete_edits(ArrayList<Edit*> *edits, int collapse)
 {
-	if( session->labels_follow_edits )
-		delete_edit_labels(edits, collapse);
-	typedef struct { Track *track; int64_t start, end; } Zone;
-	ArrayList<Zone> zones;
+	edits->sort(dead_edit_cmp);
 	for( int i=0; i<edits->size(); ++i ) {
 		Edit *edit = edits->get(i);
 		Track *track = edit->track;
 		int64_t start = edit->startproject;
-		int64_t end = start + edit->length;
-		Zone &zone = zones.append();
-		zone.track = track;  zone.start = start;  zone.end = end;
+		int64_t length = edit->length;
+		int64_t end = start + length;
 		if( session->autos_follow_edits ) {
 			track->automation->clear(start, end, 0, collapse);
 		}
@@ -816,21 +819,18 @@ void EDL::delete_edits(ArrayList<Edit*> *edits, int collapse)
 				PluginSet *plugin_set = track->plugin_set[k];
 				plugin_set->clear(start, end, 1);
 				if( !collapse )
-					plugin_set->paste_silence(start, end);
+					plugin_set->paste_silence(start, end, 1);
+				plugin_set->optimize();
 			}
 		}
-		track->optimize();
-	}
-	for( int i=0; i<zones.size(); ++i ) {
-		Zone &zone = zones[i];
-		Track *track = zone.track;
-		int64_t start = zone.start, end = zone.end;
-		track->edits->clear(start, end);
-		if( !collapse )
-			track->edits->paste_silence(start, end);
-		track->optimize();
+		Edit *dead_edit = edit;
+		if( collapse ) {
+			while( (edit=edit->next) )
+				edit->startproject -= length;
+		}
+		delete dead_edit;
+		track->edits->optimize();
 	}
-	optimize();
 }
 
 class Range {
@@ -909,59 +909,31 @@ void EDL::move_edit_labels(ArrayList<Edit*> *edits, double dist)
 	}
 }
 
+void EDL::modify_edithandles(double oldposition, double newposition,
+	int currentend, int handle_mode, int edit_labels,
+	int edit_plugins, int edit_autos, int group_id)
+{
+	tracks->modify_edithandles(oldposition, newposition,
+		currentend, handle_mode, edit_labels,
+		edit_plugins, edit_autos, group_id);
+}
 
-void EDL::modify_edithandles(double oldposition,
-	double newposition,
-	int currentend,
-	int handle_mode,
-	int edit_labels,
-	int edit_plugins,
-	int edit_autos)
+void EDL::modify_pluginhandles(double oldposition, double newposition,
+	int currentend, int handle_mode, int edit_labels,
+	int edit_autos, Edits *trim_edits)
 {
-	tracks->modify_edithandles(oldposition,
-		newposition,
-		currentend,
-		handle_mode,
-		edit_labels,
-		edit_plugins,
-		edit_autos);
-	labels->modify_handles(oldposition,
-		newposition,
-		currentend,
-		handle_mode,
-		edit_labels);
-}
-
-void EDL::modify_pluginhandles(double oldposition,
-	double newposition,
-	int currentend,
-	int handle_mode,
-	int edit_labels,
-	int edit_autos,
-	Edits *trim_edits)
-{
-	tracks->modify_pluginhandles(oldposition,
-		newposition,
-		currentend,
-		handle_mode,
-		edit_labels,
-		edit_autos,
-		trim_edits);
+	tracks->modify_pluginhandles(oldposition, newposition,
+		currentend, handle_mode, edit_labels,
+		edit_autos, trim_edits);
 	optimize();
 }
 
-void EDL::paste_silence(double start,
-	double end,
-	int edit_labels,
-	int edit_plugins,
-	int edit_autos)
+void EDL::paste_silence(double start, double end,
+	int edit_labels, int edit_plugins, int edit_autos)
 {
 	if( edit_labels )
 		labels->paste_silence(start, end);
-	tracks->paste_silence(start,
-		end,
-		edit_plugins,
-		edit_autos);
+	tracks->paste_silence(start, end, edit_plugins, edit_autos);
 }