projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix aspect ratio on split screen drag handle, add videoscope to editpanel in cwindow...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
plugindialog.C
diff --git
a/cinelerra-5.1/cinelerra/plugindialog.C
b/cinelerra-5.1/cinelerra/plugindialog.C
index 8e08d2f17313d3326f0cebb65f87b8f179a855c4..f9c24fffb9c41c8948f2b254e9b6dabbe8fde1c6 100644
(file)
--- 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;
: BC_DialogThread()
{
this->mwindow = mwindow;
- this->plugin
= 0
;
+ this->plugin
_id = -1
;
this->plugin_type = PLUGIN_NONE;
}
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;
// 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;
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;
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
{
}
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->shared_location.plugin = -1;
this->shared_location.module = -1;
this->plugin_type = PLUGIN_NONE;
+ this->plugin_id = -1;
}
strcpy(this->window_title, title);
}
strcpy(this->window_title, title);
@@
-413,7
+414,7
@@
void PluginDialog::clear_selection()
selected_available = -1;
selected_shared = -1;
selected_modules = -1;
selected_available = -1;
selected_shared = -1;
selected_modules = -1;
- thread->plugin
= 0
;
+ thread->plugin
_id = -1
;
thread->plugin_type = PLUGIN_NONE;
}
thread->plugin_type = PLUGIN_NONE;
}
@@
-444,17
+445,14
@@
void PluginDialogThread::apply()
data_type, plugin_type, single_standalone);
}
else {
data_type, plugin_type, single_standalone);
}
else {
+ Plugin *plugin = mwindow->edl->tracks->plugin_exists(plugin_id);
if( plugin ) {
if( plugin ) {
- if( mwindow->edl->tracks->plugin_exists(plugin) ) {
- plugin->change_plugin(plugin_title,
- &shared_location, plugin_type);
- }
+ plugin->change_plugin(plugin_title,
+ &shared_location, plugin_type);
}
}
- else {
- if( mwindow->edl->tracks->track_exists(track) ) {
+ else if( mwindow->edl->tracks->track_exists(track) ) {
mwindow->insert_effect(plugin_title, &shared_location,
mwindow->insert_effect(plugin_title, &shared_location,
- track, 0, 0, 0, plugin_type);
- }
+ track, 0, 0, 0, plugin_type);
}
}
}
}
@@
-466,7
+464,7
@@
void PluginDialogThread::apply()
mwindow->gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
mwindow->gui->unlock_window();
}
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)
}
PluginDialogApply::PluginDialogApply(PluginDialog *dialog, int x, int y)