X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedl.C;h=c7db139e642db5bc245721bd993313b54bea2960;hp=6f2b7e5865f784b8b30fd580b3b63553ca83ced6;hb=ab209efd7893132268c7dc159cd78a4574276946;hpb=af4a324887dc0828d96beb4858bf6fb1db1c2ae2

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index 6f2b7e58..c7db139e 100644
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -830,9 +830,11 @@ void EDL::delete_edits(ArrayList<Edit*> *edits, int collapse)
 				edit->startproject -= length;
 		}
 		delete dead_edit;
-		track->optimize();
 	}
-	optimize();
+// optimize edits only.
+//  full optimize deletes pluginsets, mistargeting drag and drop
+	for( Track *track=tracks->first; track; track=track->next )
+		track->edits->optimize();
 }
 
 class Range {
@@ -912,58 +914,33 @@ 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)
+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);
-	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_edithandles(oldposition, newposition,
+		currentend, handle_mode, edit_labels,
+		edit_plugins, edit_autos, group_id);
+	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);
 	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);
 }