diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-17 20:54:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-17 20:54:03 +0000 |
| commit | 997e4b1f9cd7ccfc704b7c035051da7f60d831e7 (patch) | |
| tree | 1236e40183b677abf4a2882e4cfe8e0a345eb24d /gtk2_ardour/processor_box.cc | |
| parent | 19a4b990325577fc949ccd5d5fbad4520eb1df56 (diff) | |
merge with 2.0-ongoing @ rev 3147
git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/processor_box.cc')
| -rw-r--r-- | gtk2_ardour/processor_box.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 9f6dff823b..b2b1c3b538 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -1097,17 +1097,17 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor) ARDOUR::PluginType type = plugin_processor->type(); if (type == ARDOUR::LADSPA || type == ARDOUR::VST) { + PluginUIWindow *plugin_ui; + /* these are both allowed to be null */ + + Container* toplevel = get_toplevel(); + Window* win = dynamic_cast<Gtk::Window*>(toplevel); + if (plugin_processor->get_gui() == 0) { - plugin_ui = new PluginUIWindow (plugin_processor, _session.frame_rate(), _session.engine().frames_per_cycle()); - - if (_owner_is_mixer) { - ARDOUR_UI::instance()->the_mixer()->ensure_float (*plugin_ui); - } else { - ARDOUR_UI::instance()->the_editor().ensure_float (*plugin_ui); - } + plugin_ui = new PluginUIWindow (win, plugin_processor); WindowTitle title(Glib::get_application_name()); title += generate_processor_title (plugin_processor); @@ -1117,7 +1117,6 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor) // change window title when route name is changed _route->NameChanged.connect (bind (mem_fun(*this, &ProcessorBox::route_name_changed), plugin_ui, boost::weak_ptr<PluginInsert> (plugin_processor))); - } else { plugin_ui = reinterpret_cast<PluginUIWindow *> (plugin_processor->get_gui()); |