X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fplugindialog.C;h=8063982bfe8ffa652b11cf624af470f050b76e17;hb=0b751b07a28e84a721b2bb76083db6629aa26d73;hp=8e08d2f17313d3326f0cebb65f87b8f179a855c4;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/plugindialog.C b/cinelerra-5.1/cinelerra/plugindialog.C
index 8e08d2f1..8063982b 100644
--- a/cinelerra-5.1/cinelerra/plugindialog.C
+++ b/cinelerra-5.1/cinelerra/plugindialog.C
@@ -44,7 +44,7 @@ PluginDialogThread::PluginDialogThread(MWindow *mwindow)
  : BC_DialogThread()
 {
 	this->mwindow = mwindow;
-	this->plugin = 0;
+	this->plugin_id = -1;
 	this->plugin_type = PLUGIN_NONE;
 }
 
@@ -62,7 +62,6 @@ void PluginDialogThread::start_window(Track *track,
 //		mwindow->gui->lock_window("PluginDialogThread::start_window");
 		this->track = track;
 		this->data_type = data_type;
-		this->plugin = plugin;
 		this->is_mainmenu = is_mainmenu;
 		single_standalone = mwindow->edl->session->single_standalone;
 
@@ -71,6 +70,7 @@ void PluginDialogThread::start_window(Track *track,
 			plugin->calculate_title(plugin_title, 0);
 			this->shared_location = plugin->shared_location;
 			this->plugin_type = plugin->plugin_type;
+			this->plugin_id = plugin->orig_id;
 		}
 		else
 		{
@@ -78,6 +78,7 @@ void PluginDialogThread::start_window(Track *track,
 			this->shared_location.plugin = -1;
 			this->shared_location.module = -1;
 			this->plugin_type = PLUGIN_NONE;
+			this->plugin_id = -1;
 		}
 
 		strcpy(this->window_title, title);
@@ -413,7 +414,7 @@ void PluginDialog::clear_selection()
 	selected_available = -1;
 	selected_shared = -1;
 	selected_modules = -1;
-	thread->plugin = 0;
+	thread->plugin_id = -1;
 	thread->plugin_type = PLUGIN_NONE;
 }
 
@@ -434,8 +435,10 @@ void PluginDialog::apply()
 
 void PluginDialogThread::apply()
 {
-	if( mwindow->edl )
-		mwindow->edl->session->single_standalone = single_standalone;
+	Plugin *plugin = 0;
+	EDL *edl = mwindow->edl;
+	if( edl )
+		edl->session->single_standalone = single_standalone;
 	if(plugin_type) {
 		mwindow->gui->lock_window("PluginDialogThread::run 3");
 		mwindow->undo->update_undo_before();
@@ -443,19 +446,20 @@ void PluginDialogThread::apply()
 			mwindow->insert_effect(plugin_title, &shared_location,
 				data_type, plugin_type, single_standalone);
 		}
-		else {
-			if( plugin ) {
-				if( mwindow->edl->tracks->plugin_exists(plugin) ) {
-					plugin->change_plugin(plugin_title,
-						&shared_location, plugin_type);
-				}
-			}
-			else {
-				if( mwindow->edl->tracks->track_exists(track) ) {
-					mwindow->insert_effect(plugin_title, &shared_location,
-						track, 0, 0, 0, plugin_type);
-				}
+		else if( (plugin=edl->tracks->plugin_exists(plugin_id)) != 0 ) {
+			plugin->change_plugin(plugin_title,
+					&shared_location, plugin_type);
+		}
+		else if( edl->tracks->track_exists(track) ) {
+			double start = edl->local_session->get_selectionstart(1);
+			double end = edl->local_session->get_selectionend(1);
+			if( start >= end ) {
+				start = 0;
+				end = track->get_length();
 			}
+			double length = end - start;
+			mwindow->insert_effect(plugin_title, &shared_location,
+					track, 0, start, length, plugin_type);
 		}
 
 		mwindow->save_backup();
@@ -466,7 +470,7 @@ void PluginDialogThread::apply()
 		mwindow->gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
 		mwindow->gui->unlock_window();
 	}
-	plugin = 0;
+	plugin_id = -1;
 }
 
 PluginDialogApply::PluginDialogApply(PluginDialog *dialog, int x, int y)