Merge branch 'master' into windows
[ardour.git] / gtk2_ardour / plugin_ui.cc
index 1c5a56f531259f0b5a2395f7c19a6629a3afa6b6..4423e3905dced33d360825f931aa25ab712c9e6b 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/slider_controller.h>
+#include <gtkmm2ext/application.h>
 
-#include "midi++/manager.h"
-
+#include "ardour/session.h"
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/ladspa_plugin.h"
-#ifdef VST_SUPPORT
-#include "ardour/vst_plugin.h"
+#ifdef WINDOWS_VST_SUPPORT
+#include "ardour/windows_vst_plugin.h"
+#include "windows_vst_plugin_ui.h"
+#endif
+#ifdef LXVST_SUPPORT
+#include "ardour/lxvst_plugin.h"
+#include "lxvst_plugin_ui.h"
 #endif
-#ifdef HAVE_SLV2
+#ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
 #include "lv2_plugin_ui.h"
 #endif
 
-#include <lrdf.h>
-
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "ardour_ui.h"
 #include "prompter.h"
 #include "plugin_ui.h"
@@ -64,6 +67,7 @@
 #include "keyboard.h"
 #include "latency_gui.h"
 #include "plugin_eq_gui.h"
+#include "new_plugin_preset_dialog.h"
 
 #include "i18n.h"
 
@@ -72,28 +76,38 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
-using namespace sigc;
 
-PluginUIWindow::PluginUIWindow (Gtk::Window* win, boost::shared_ptr<PluginInsert> insert, bool scrollable)
-       : parent (win)
+PluginUIWindow::PluginUIWindow (
+       boost::shared_ptr<PluginInsert> insert,
+       bool                            scrollable,
+       bool                            editor)
+       : ArdourWindow (string())
+       , was_visible (false)
+       , _keyboard_focused (false)
+#ifdef AUDIOUNIT_SUPPORT
+        , pre_deactivate_x (-1)
+        , pre_deactivate_y (-1)
+#endif
+
 {
        bool have_gui = false;
-       non_gtk_gui = false;
-       was_visible = false;
-
        Label* label = manage (new Label());
        label->set_markup ("<b>THIS IS THE PLUGIN UI</b>");
 
-       if (insert->plugin()->has_editor()) {
+       if (editor && insert->plugin()->has_editor()) {
                switch (insert->type()) {
-               case ARDOUR::VST:
-                       have_gui = create_vst_editor (insert);
+               case ARDOUR::Windows_VST:
+                       have_gui = create_windows_vst_editor (insert);
+                       break;
+                       
+               case ARDOUR::LXVST:
+                       have_gui = create_lxvst_editor (insert);
                        break;
 
                case ARDOUR::AudioUnit:
                        have_gui = create_audiounit_editor (insert);
                        break;
-                       
+
                case ARDOUR::LADSPA:
                        error << _("Eh? LADSPA plugins don't have editors!") << endmsg;
                        break;
@@ -103,8 +117,8 @@ PluginUIWindow::PluginUIWindow (Gtk::Window* win, boost::shared_ptr<PluginInsert
                        break;
 
                default:
-#ifndef VST_SUPPORT
-                       error << _("unknown type of editor-supplying plugin (note: no VST support in this version of ardour)")
+#ifndef WINDOWS_VST_SUPPORT
+                       error << string_compose (_("unknown type of editor-supplying plugin (note: no VST support in this version of %1)"), PROGRAM_NAME)
                              << endmsg;
 #else
                        error << _("unknown type of editor-supplying plugin")
@@ -113,206 +127,201 @@ PluginUIWindow::PluginUIWindow (Gtk::Window* win, boost::shared_ptr<PluginInsert
                        throw failed_constructor ();
                }
 
-       } 
+       }
 
        if (!have_gui) {
+               GenericPluginUI* pu = new GenericPluginUI (insert, scrollable);
 
-               GenericPluginUI*  pu  = new GenericPluginUI (insert, scrollable);
-               
                _pluginui = pu;
-               add( *pu );
-
-               /*
-               Gtk::HBox *hbox = new Gtk::HBox();
-               hbox->pack_start( *pu);
-               // TODO: this should be nicer
-               hbox->pack_start( eqgui_bin );
-               
-               add (*manage(hbox));
-               */
-
-               set_wmclass (X_("ardour_plugin_editor"), "Ardour");
+               _pluginui->KeyboardFocused.connect (sigc::mem_fun (*this, &PluginUIWindow::keyboard_focused));
+               add (*pu);
+               set_wmclass (X_("ardour_plugin_editor"), PROGRAM_NAME);
 
-               signal_map_event().connect (mem_fun (*pu, &GenericPluginUI::start_updating));
-               signal_unmap_event().connect (mem_fun (*pu, &GenericPluginUI::stop_updating));
+               signal_map_event().connect (sigc::mem_fun (*pu, &GenericPluginUI::start_updating));
+               signal_unmap_event().connect (sigc::mem_fun (*pu, &GenericPluginUI::stop_updating));
        }
 
-       // set_position (Gtk::WIN_POS_MOUSE);
        set_name ("PluginEditor");
        add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
 
-       signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window*> (this)), false);
-       death_connection = insert->GoingAway.connect (mem_fun(*this, &PluginUIWindow::plugin_going_away));
-       
+       insert->DropReferences.connect (death_connection, invalidator (*this), boost::bind (&PluginUIWindow::plugin_going_away, this), gui_context());
+
        gint h = _pluginui->get_preferred_height ();
        gint w = _pluginui->get_preferred_width ();
 
        if (scrollable) {
                if (h > 600) h = 600;
-               if (w > 600) w = 600;
-
-               if (w < 0) {
-                       w = 450;
-               }
        }
 
-       set_default_size (w, h); 
+       set_default_size (w, h);
+       set_resizable (_pluginui->resizable());
 }
 
 PluginUIWindow::~PluginUIWindow ()
 {
+       cerr << "PluginWindow deleted for " << this << endl;
        delete _pluginui;
 }
 
 void
-PluginUIWindow::set_parent (Gtk::Window* win)
+PluginUIWindow::on_show ()
 {
-       parent = win;
+       set_role("plugin_ui");
+
+       if (_pluginui) {
+               _pluginui->update_preset_list ();
+               _pluginui->update_preset ();
+       }
+
+       if (_pluginui) {
+#if defined (HAVE_AUDIOUNITS) && defined(GTKOSX)
+                if (pre_deactivate_x >= 0) {                                                                             
+                        move (pre_deactivate_x, pre_deactivate_y);
+                }                                                      
+#endif
+
+               if (_pluginui->on_window_show (_title)) {
+                       Window::on_show ();
+               }
+       }
 }
 
 void
-PluginUIWindow::on_map ()
+PluginUIWindow::on_hide ()
 {
-       Window::on_map ();
-       set_keep_above (true);
-}
+#if defined (HAVE_AUDIOUNITS) && defined(GTKOSX)
+        get_position (pre_deactivate_x, pre_deactivate_y);                                                               
+#endif
 
-bool
-PluginUIWindow::on_enter_notify_event (GdkEventCrossing *ev)
-{
-       Keyboard::the_keyboard().enter_window (ev, this);
-       return false;
-}
+       Window::on_hide ();
 
-bool
-PluginUIWindow::on_leave_notify_event (GdkEventCrossing *ev)
-{
-       Keyboard::the_keyboard().leave_window (ev, this);
-       return false;
+       if (_pluginui) {
+               _pluginui->on_window_hide ();
+       }
 }
 
-bool
-PluginUIWindow::on_focus_in_event (GdkEventFocus *ev)
+void
+PluginUIWindow::set_title(const std::string& title)
 {
-       Window::on_focus_in_event (ev);
-       //Keyboard::the_keyboard().magic_widget_grab_focus ();
-       return false;
+       Gtk::Window::set_title(title);
+       _title = title;
 }
 
 bool
-PluginUIWindow::on_focus_out_event (GdkEventFocus *ev)
+#ifdef WINDOWS_VST_SUPPORT
+PluginUIWindow::create_windows_vst_editor(boost::shared_ptr<PluginInsert> insert)
+#else
+PluginUIWindow::create_windows_vst_editor(boost::shared_ptr<PluginInsert>)
+#endif
 {
-       Window::on_focus_out_event (ev);
-       //Keyboard::the_keyboard().magic_widget_drop_focus ();
+#ifndef WINDOWS_VST_SUPPORT
        return false;
-}
+#else
 
-void
-PluginUIWindow::on_show ()
-{
-       if (_pluginui) {
-               _pluginui->update_presets ();
-       }
+       boost::shared_ptr<WindowsVSTPlugin> vp;
 
-       Window::on_show ();
+       if ((vp = boost::dynamic_pointer_cast<WindowsVSTPlugin> (insert->plugin())) == 0) {
+               error << string_compose (_("unknown type of editor-supplying plugin (note: no VST support in this version of %1)"), PROGRAM_NAME)
+                     << endmsg;
+               throw failed_constructor ();
+       } else {
+               WindowsVSTPluginUI* vpu = new WindowsVSTPluginUI (insert, vp);
 
-       if (parent) {
-               // set_transient_for (*parent);
+               _pluginui = vpu;
+               _pluginui->KeyboardFocused.connect (sigc::mem_fun (*this, &PluginUIWindow::keyboard_focused));
+               add (*vpu);
+               vpu->package (*this);
        }
-}
 
-void
-PluginUIWindow::on_hide ()
-{
-       Window::on_hide ();
+       return true;
+#endif
 }
 
 bool
-#ifdef VST_SUPPORT
-PluginUIWindow::create_vst_editor(boost::shared_ptr<PluginInsert> insert)
+#ifdef LXVST_SUPPORT
+PluginUIWindow::create_lxvst_editor(boost::shared_ptr<PluginInsert> insert)
 #else
-PluginUIWindow::create_vst_editor(boost::shared_ptr<PluginInsert>)
-#endif 
+PluginUIWindow::create_lxvst_editor(boost::shared_ptr<PluginInsert>)
+#endif
 {
-#ifndef VST_SUPPORT
+#ifndef LXVST_SUPPORT
        return false;
 #else
 
-       boost::shared_ptr<VSTPlugin> vp;
+       boost::shared_ptr<LXVSTPlugin> lxvp;
 
-       if ((vp = boost::dynamic_pointer_cast<VSTPlugin> (insert->plugin())) == 0) {
-               error << _("unknown type of editor-supplying plugin (note: no VST support in this version of ardour)")
-                             << endmsg;
+       if ((lxvp = boost::dynamic_pointer_cast<LXVSTPlugin> (insert->plugin())) == 0) {
+               error << string_compose (_("unknown type of editor-supplying plugin (note: no linuxVST support in this version of %1)"), PROGRAM_NAME)
+                     << endmsg;
                throw failed_constructor ();
        } else {
-               VSTPluginUI* vpu = new VSTPluginUI (insert, vp);
-       
-               _pluginui = vpu;
-               add (*vpu);
-               vpu->package (*this);
+               LXVSTPluginUI* lxvpu = new LXVSTPluginUI (insert, lxvp);
+
+               _pluginui = lxvpu;
+               _pluginui->KeyboardFocused.connect (sigc::mem_fun (*this, &PluginUIWindow::keyboard_focused));
+               add (*lxvpu);
+               lxvpu->package (*this);
        }
 
-       non_gtk_gui = true;
        return true;
 #endif
 }
 
 bool
-#if defined (HAVE_AUDIOUNITS) && defined (GTKOSX)
+#ifdef AUDIOUNIT_SUPPORT
 PluginUIWindow::create_audiounit_editor (boost::shared_ptr<PluginInsert> insert)
 #else
 PluginUIWindow::create_audiounit_editor (boost::shared_ptr<PluginInsert>)
-#endif 
+#endif
 {
-#if !defined(HAVE_AUDIOUNITS) || !defined(GTKOSX)
+#ifndef AUDIOUNIT_SUPPORT
        return false;
 #else
        VBox* box;
        _pluginui = create_au_gui (insert, &box);
+       _pluginui->KeyboardFocused.connect (sigc::mem_fun (*this, &PluginUIWindow::keyboard_focused));
        add (*box);
-       non_gtk_gui = true;
 
-       extern sigc::signal<void,bool> ApplicationActivationChanged;
-       ApplicationActivationChanged.connect (mem_fun (*this, &PluginUIWindow::app_activated));
+       Application::instance()->ActivationChanged.connect (mem_fun (*this, &PluginUIWindow::app_activated));
 
        return true;
 #endif
 }
 
 void
-#if defined (HAVE_AUDIOUNITS) && defined(GTKOSX)
+#ifdef GTKOSX
 PluginUIWindow::app_activated (bool yn)
 #else
 PluginUIWindow::app_activated (bool)
-#endif 
+#endif
 {
-#if defined (HAVE_AUDIOUNITS) && defined(GTKOSX)
-       cerr << "APP activated ? " << yn << endl;
+#ifdef AUDIOUNIT_SUPPORT
        if (_pluginui) {
                if (yn) {
                        if (was_visible) {
                                _pluginui->activate ();
+                                if (pre_deactivate_x >= 0) {
+                                        move (pre_deactivate_x, pre_deactivate_y);
+                                }
                                present ();
                                was_visible = true;
                        }
                } else {
                        was_visible = is_visible();
+                        get_position (pre_deactivate_x, pre_deactivate_y);
                        hide ();
                        _pluginui->deactivate ();
                }
-       } 
+       }
 #endif
 }
 
 bool
 PluginUIWindow::create_lv2_editor(boost::shared_ptr<PluginInsert> insert)
 {
-#ifndef HAVE_SLV2
-       return false;
-#else
-
+#ifdef HAVE_SUIL
        boost::shared_ptr<LV2Plugin> vp;
-       
+
        if ((vp = boost::dynamic_pointer_cast<LV2Plugin> (insert->plugin())) == 0) {
                error << _("create_lv2_editor called on non-LV2 plugin") << endmsg;
                throw failed_constructor ();
@@ -323,89 +332,152 @@ PluginUIWindow::create_lv2_editor(boost::shared_ptr<PluginInsert> insert)
                lpu->package (*this);
        }
 
-       non_gtk_gui = false;
        return true;
+#else
+       return false;
 #endif
 }
 
+void
+PluginUIWindow::keyboard_focused (bool yn)
+{
+       _keyboard_focused = yn;
+}
+
 bool
 PluginUIWindow::on_key_press_event (GdkEventKey* event)
 {
-       if (!key_press_focus_accelerator_handler (*this, event)) {
-               return PublicEditor::instance().on_key_press_event(event);
-       } else {
+       if (_keyboard_focused) {
+               if (_pluginui) {
+                       if (_pluginui->non_gtk_gui()) {
+                               _pluginui->forward_key_event (event);
+                       } else {
+                               return relay_key_press (event, this);
+                       }
+               }
                return true;
+       } else {
+               /* for us to be getting key press events, there really
+                  MUST be a _pluginui, but just to be safe, check ...
+               */
+
+               if (_pluginui) {
+                       if (_pluginui->non_gtk_gui()) {
+                               /* pass editor window as the window for the event
+                                  to be handled in, not this one, because there are
+                                  no widgets in this window that we want to have
+                                  key focus.
+                               */
+                               return relay_key_press (event, &PublicEditor::instance());
+                       } else {
+                               return relay_key_press (event, this);
+                       }
+               } else {
+                       return false;
+               }
        }
 }
 
 bool
-PluginUIWindow::on_key_release_event (GdkEventKey *)
+PluginUIWindow::on_key_release_event (GdkEventKey *event)
 {
-       return true;
+       if (_keyboard_focused) {
+               if (_pluginui) {
+                       if (_pluginui->non_gtk_gui()) {
+                               _pluginui->forward_key_event (event);
+                       }
+                       return true;
+               }
+               return false;
+       } else {
+               return true;
+       }
 }
 
 void
 PluginUIWindow::plugin_going_away ()
 {
-       ENSURE_GUI_THREAD(mem_fun(*this, &PluginUIWindow::plugin_going_away));
-       
+       ENSURE_GUI_THREAD (*this, &PluginUIWindow::plugin_going_away)
+
        if (_pluginui) {
                _pluginui->stop_updating(0);
        }
 
        death_connection.disconnect ();
-
-       delete_when_idle (this);
 }
 
 PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi)
-       : insert (pi),
-         plugin (insert->plugin()),
-         save_button(_("Add")),
-         bypass_button (_("Bypass")),
-         latency_gui (0),
-         plugin_analysis_expander (_("Plugin analysis"))
-{
-       //preset_combo.set_use_arrows_always(true);
-       update_presets();
-       preset_combo.set_size_request (100, -1);
-       preset_combo.set_active_text ("");
-       preset_combo.signal_changed().connect(mem_fun(*this, &PlugUIBase::setting_selected));
+       : insert (pi)
+       , plugin (insert->plugin())
+       , add_button (_("Add"))
+       , save_button (_("Save"))
+       , delete_button (_("Delete"))
+       , bypass_button (ArdourButton::led_default_elements)
+       , description_expander (_("Description"))
+       , plugin_analysis_expander (_("Plugin analysis"))
+       , latency_gui (0)
+       , latency_dialog (0)
+       , eqgui (0)
+{
+       _preset_modified.set_size_request (16, -1);
+       _preset_combo.signal_changed().connect(sigc::mem_fun(*this, &PlugUIBase::preset_selected));
+       ARDOUR_UI::instance()->set_tip (_preset_combo, _("Presets (if any) for this plugin\n(Both factory and user-created)"));
+       ARDOUR_UI::instance()->set_tip (add_button, _("Save a new preset"));
+       ARDOUR_UI::instance()->set_tip (save_button, _("Save the current preset"));
+       ARDOUR_UI::instance()->set_tip (delete_button, _("Delete the current preset"));
+       ARDOUR_UI::instance()->set_tip (bypass_button, _("Disable signal processing by the plugin"));
+       _no_load_preset = 0;
+
+       update_preset_list ();
+       update_preset ();
+
+       add_button.set_name ("PluginAddButton");
+       add_button.signal_clicked().connect (sigc::mem_fun (*this, &PlugUIBase::add_plugin_setting));
 
        save_button.set_name ("PluginSaveButton");
-       save_button.signal_clicked().connect(mem_fun(*this, &PlugUIBase::save_plugin_setting));
+       save_button.signal_clicked().connect(sigc::mem_fun(*this, &PlugUIBase::save_plugin_setting));
 
-       insert->ActiveChanged.connect (bind(
-                       mem_fun(*this, &PlugUIBase::processor_active_changed),
-                       boost::weak_ptr<Processor>(insert)));
+       delete_button.set_name ("PluginDeleteButton");
+       delete_button.signal_clicked().connect (sigc::mem_fun (*this, &PlugUIBase::delete_plugin_setting));
 
-       bypass_button.set_active (!pi->active());
+       insert->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&PlugUIBase::processor_active_changed, this,  boost::weak_ptr<Processor>(insert)), gui_context());
 
-       bypass_button.set_name ("PluginBypassButton");
-       bypass_button.signal_toggled().connect (mem_fun(*this, &PlugUIBase::bypass_toggled));
+       bypass_button.set_name ("plugin bypass button");
+       bypass_button.set_text (_("Bypass"));
+       bypass_button.set_active (!pi->active());
+       bypass_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PlugUIBase::bypass_button_release));
        focus_button.add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK);
 
-       focus_button.signal_button_release_event().connect (mem_fun(*this, &PlugUIBase::focus_toggled));
+       focus_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PlugUIBase::focus_toggled));
        focus_button.add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK);
 
        /* these images are not managed, so that we can remove them at will */
 
        focus_out_image = new Image (get_icon (X_("computer_keyboard")));
        focus_in_image = new Image (get_icon (X_("computer_keyboard_active")));
-       
+
        focus_button.add (*focus_out_image);
 
-       ARDOUR_UI::instance()->set_tip (&focus_button, _("Click to allow the plugin to receive keyboard events that Ardour would normally use as a shortcut"), "");
-       ARDOUR_UI::instance()->set_tip (&bypass_button, _("Click to enable/disable this plugin"), "");
+       ARDOUR_UI::instance()->set_tip (focus_button, string_compose (_("Click to allow the plugin to receive keyboard events that %1 would normally use as a shortcut"), PROGRAM_NAME));
+       ARDOUR_UI::instance()->set_tip (bypass_button, _("Click to enable/disable this plugin"));
+
+       description_expander.property_expanded().signal_changed().connect( sigc::mem_fun(*this, &PlugUIBase::toggle_description));
+       description_expander.set_expanded(false);
 
-       plugin_analysis_expander.property_expanded().signal_changed().connect( mem_fun(*this, &PlugUIBase::toggle_plugin_analysis));
+       plugin_analysis_expander.property_expanded().signal_changed().connect( sigc::mem_fun(*this, &PlugUIBase::toggle_plugin_analysis));
        plugin_analysis_expander.set_expanded(false);
 
-       insert->GoingAway.connect (mem_fun (*this, &PlugUIBase::plugin_going_away));
+       insert->DropReferences.connect (death_connection, invalidator (*this), boost::bind (&PlugUIBase::plugin_going_away, this), gui_context());
+
+       plugin->PresetAdded.connect (*this, invalidator (*this), boost::bind (&PlugUIBase::preset_added_or_removed, this), gui_context ());
+       plugin->PresetRemoved.connect (*this, invalidator (*this), boost::bind (&PlugUIBase::preset_added_or_removed, this), gui_context ());
+       plugin->PresetLoaded.connect (*this, invalidator (*this), boost::bind (&PlugUIBase::update_preset, this), gui_context ());
+       plugin->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&PlugUIBase::parameter_changed, this, _1, _2), gui_context ());
 }
 
 PlugUIBase::~PlugUIBase()
 {
+       delete eqgui;
        delete latency_gui;
 }
 
@@ -420,17 +492,18 @@ PlugUIBase::plugin_going_away ()
 void
 PlugUIBase::set_latency_label ()
 {
-       char buf[64];
-       nframes_t l = insert->effective_latency ();
-       nframes_t sr = insert->session().frame_rate();
+       framecnt_t const l = insert->effective_latency ();
+       framecnt_t const sr = insert->session().frame_rate ();
+
+       string t;
 
        if (l < sr / 1000) {
-               snprintf (buf, sizeof (buf), "latency (%d samples)", l);
+               t = string_compose (P_("latency (%1 sample)", "latency (%1 samples)", l), l);
        } else {
-               snprintf (buf, sizeof (buf), "latency (%.2f msecs)", (float) l / ((float) sr / 1000.0f));
+               t = string_compose (_("latency (%1 ms)"), (float) l / ((float) sr / 1000.0f));
        }
 
-       latency_label.set_text (buf);
+       latency_label.set_text (t);
 }
 
 void
@@ -438,9 +511,17 @@ PlugUIBase::latency_button_clicked ()
 {
        if (!latency_gui) {
                latency_gui = new LatencyGUI (*(insert.get()), insert->session().frame_rate(), insert->session().get_block_size());
-               latency_dialog = new ArdourDialog ("Edit Latency", false, false);
-               latency_dialog->get_vbox()->pack_start (*latency_gui);
-               latency_dialog->signal_hide().connect (mem_fun (*this, &PlugUIBase::set_latency_label));
+               latency_dialog = new ArdourWindow (_("Edit Latency"));
+               /* use both keep-above and transient for to try cover as many
+                  different WM's as possible.
+               */
+               latency_dialog->set_keep_above (true);
+               Window* win = dynamic_cast<Window*> (bypass_button.get_toplevel ());
+               if (win) {
+                       latency_dialog->set_transient_for (*win);
+               }
+               latency_dialog->add (*latency_gui);
+               latency_dialog->signal_hide().connect (sigc::mem_fun (*this, &PlugUIBase::set_latency_label));
        }
 
        latency_dialog->show_all ();
@@ -449,65 +530,120 @@ PlugUIBase::latency_button_clicked ()
 void
 PlugUIBase::processor_active_changed (boost::weak_ptr<Processor> weak_p)
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &PlugUIBase::processor_active_changed), weak_p));
-       boost::shared_ptr<Processor> p (weak_p);
+       ENSURE_GUI_THREAD (*this, &PlugUIBase::processor_active_changed, weak_p);
+       boost::shared_ptr<Processor> p (weak_p.lock());
+
        if (p) {
                bypass_button.set_active (!p->active());
        }
 }
 
 void
-PlugUIBase::setting_selected()
+PlugUIBase::preset_selected ()
 {
-       if (preset_combo.get_active_text().length() > 0) {
-               const Plugin::PresetRecord* pr = plugin->preset_by_label(preset_combo.get_active_text());
+       if (_no_load_preset) {
+               return;
+       }
+
+       if (_preset_combo.get_active_text().length() > 0) {
+               const Plugin::PresetRecord* pr = plugin->preset_by_label (_preset_combo.get_active_text());
                if (pr) {
-                       plugin->load_preset(pr->uri);
+                       plugin->load_preset (*pr);
                } else {
                        warning << string_compose(_("Plugin preset %1 not found"),
-                                       preset_combo.get_active_text()) << endmsg;
+                                                 _preset_combo.get_active_text()) << endmsg;
                }
+       } else {
+               // blank selected = no preset
+               plugin->clear_preset();
        }
 }
 
+#ifdef NO_PLUGIN_STATE
+static bool seen_saving_message = false;
+#endif
+
 void
-PlugUIBase::save_plugin_setting ()
+PlugUIBase::add_plugin_setting ()
 {
-       ArdourPrompter prompter (true);
-       prompter.set_prompt(_("Name of New Preset:"));
-       prompter.add_button (Gtk::Stock::ADD, Gtk::RESPONSE_ACCEPT);
-       prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
-       prompter.set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
-
-       prompter.show_all();
-       prompter.present ();
+#ifndef NO_PLUGIN_STATE
+       NewPluginPresetDialog d (plugin);
 
-       switch (prompter.run ()) {
+       switch (d.run ()) {
        case Gtk::RESPONSE_ACCEPT:
-               string name;
-               prompter.get_result(name);
-               if (name.length()) {
-                       if (plugin->save_preset(name)) {
-                               update_presets();
-                               preset_combo.set_active_text (name);
-                       }
+               if (d.name().empty()) {
+                       break;
+               }
+
+               if (d.replace ()) {
+                       plugin->remove_preset (d.name ());
+               }
+
+               Plugin::PresetRecord const r = plugin->save_preset (d.name());
+               if (!r.uri.empty ()) {
+                       plugin->load_preset (r);
                }
                break;
        }
+#else 
+       if (!seen_saving_message) {
+               info << string_compose (_("Plugin presets are not supported in this build of %1. Consider paying for a full version"),
+                                       PROGRAM_NAME)
+                    << endmsg;
+               seen_saving_message = true;
+       }
+#endif
 }
 
 void
-PlugUIBase::bypass_toggled ()
+PlugUIBase::save_plugin_setting ()
 {
-       bool x;
+#ifndef NO_PLUGIN_STATE
+       string const name = _preset_combo.get_active_text ();
+       plugin->remove_preset (name);
+       Plugin::PresetRecord const r = plugin->save_preset (name);
+       if (!r.uri.empty ()) {
+               plugin->load_preset (r);
+       }
+#else 
+       if (!seen_saving_message) {
+               info << string_compose (_("Plugin presets are not supported in this build of %1. Consider paying for a newer version"),
+                                       PROGRAM_NAME)
+                    << endmsg;
+               seen_saving_message = true;
+       }
+#endif
+}
 
-       if ((x = bypass_button.get_active()) == insert->active()) {
-               if (x) {
-                       insert->deactivate ();
-               } else {
+void
+PlugUIBase::delete_plugin_setting ()
+{
+#ifndef NO_PLUGIN_STATE
+       plugin->remove_preset (_preset_combo.get_active_text ());
+#else
+       if (!seen_saving_message) {
+               info << string_compose (_("Plugin presets are not supported in this build of %1. Consider paying for a newer version"),
+                                       PROGRAM_NAME)
+                    << endmsg;
+               seen_saving_message = true;
+       }
+#endif
+}
+
+bool
+PlugUIBase::bypass_button_release (GdkEventButton*)
+{
+       bool view_says_bypassed = (bypass_button.active_state() != 0);
+       
+       if (view_says_bypassed != insert->active()) {
+               if (view_says_bypassed) {
                        insert->activate ();
+               } else {
+                       insert->deactivate ();
                }
        }
+
+       return false;
 }
 
 bool
@@ -518,65 +654,139 @@ PlugUIBase::focus_toggled (GdkEventButton*)
                focus_button.remove ();
                focus_button.add (*focus_out_image);
                focus_out_image->show ();
-               ARDOUR_UI::instance()->set_tip (&focus_button, _("Click to allow the plugin to receive keyboard events that Ardour would normally use as a shortcut"), "");
+               ARDOUR_UI::instance()->set_tip (focus_button, string_compose (_("Click to allow the plugin to receive keyboard events that %1 would normally use as a shortcut"), PROGRAM_NAME));
+               KeyboardFocused (false);
        } else {
                Keyboard::the_keyboard().magic_widget_grab_focus();
                focus_button.remove ();
                focus_button.add (*focus_in_image);
                focus_in_image->show ();
-               ARDOUR_UI::instance()->set_tip (&focus_button, _("Click to allow normal use of Ardour keyboard shortcuts"), "");
+               ARDOUR_UI::instance()->set_tip (focus_button, string_compose (_("Click to allow normal use of %1 keyboard shortcuts"), PROGRAM_NAME));
+               KeyboardFocused (true);
        }
 
        return true;
 }
 
 void
-PlugUIBase::toggle_plugin_analysis()
+PlugUIBase::toggle_description()
 {
-       if (plugin_analysis_expander.get_expanded() && 
-            !plugin_analysis_expander.get_child()) {
-               // Create the GUI
-               PluginEqGui *foo = new PluginEqGui(insert);
-               plugin_analysis_expander.add( *foo );
-               plugin_analysis_expander.show_all();
-       } 
-       
-       Gtk::Widget *gui;
+       if (description_expander.get_expanded() &&
+           !description_expander.get_child()) {
+               const std::string text = plugin->get_docs();
+               if (text.empty()) {
+                       return;
+               }
 
-       if (!plugin_analysis_expander.get_expanded() && 
-            (gui = plugin_analysis_expander.get_child())) {
-               // Hide & remove
-               gui->hide();
-               //plugin_analysis_expander.remove(*gui);
-               plugin_analysis_expander.remove();
+               Gtk::Label* label = manage(new Gtk::Label(text));
+               label->set_line_wrap(true);
+               label->set_line_wrap_mode(Pango::WRAP_WORD);
+               description_expander.add(*label);
+               description_expander.show_all();
+       }
+       
+       if (!description_expander.get_expanded()) {
+               description_expander.remove();
+       }
+}
 
-               delete gui;
 
-               Gtk::Widget *toplevel = plugin_analysis_expander.get_toplevel();
-               if (!toplevel) {
-                       std::cerr << "No toplevel widget?!?!" << std::endl;
-                       return;
+void
+PlugUIBase::toggle_plugin_analysis()
+{
+       if (plugin_analysis_expander.get_expanded() &&
+           !plugin_analysis_expander.get_child()) {
+               // Create the GUI
+               if (eqgui == 0) {
+                       eqgui = new PluginEqGui (insert);
                }
 
-               Gtk::Container *cont = dynamic_cast<Gtk::Container *>(toplevel);
-               if (!cont) {
-                       std::cerr << "Toplevel widget is not a container?!?" << std::endl;
-                       return;
+               Gtk::Window *toplevel = (Gtk::Window*) plugin_analysis_expander.get_ancestor (GTK_TYPE_WINDOW);
+
+               if (toplevel) {
+                       toplevel->get_size (pre_eq_size.width, pre_eq_size.height);
                }
 
-               Gtk::Allocation alloc(0, 0, 50, 50); // Just make it small
-               toplevel->size_allocate(alloc);
+               plugin_analysis_expander.add (*eqgui);
+               plugin_analysis_expander.show_all ();
+               eqgui->start_listening ();
+       }
+
+       if (!plugin_analysis_expander.get_expanded()) {
+               // Hide & remove from expander
+
+               eqgui->hide ();
+               eqgui->stop_listening ();
+               plugin_analysis_expander.remove();
+
+               Gtk::Window *toplevel = (Gtk::Window*) plugin_analysis_expander.get_ancestor (GTK_TYPE_WINDOW);
+
+               if (toplevel) {
+                       toplevel->resize (pre_eq_size.width, pre_eq_size.height);
+               }
        }
 }
 
 void
-PlugUIBase::update_presets ()
+PlugUIBase::update_preset_list ()
 {
        vector<string> preset_labels;
        vector<ARDOUR::Plugin::PresetRecord> presets = plugin->get_presets();
-       for (vector<ARDOUR::Plugin::PresetRecord>::const_iterator i = presets.begin();
-                  i != presets.end(); ++i) {
-               preset_labels.push_back(i->label);
+
+       ++_no_load_preset;
+
+       for (vector<ARDOUR::Plugin::PresetRecord>::const_iterator i = presets.begin(); i != presets.end(); ++i) {
+               preset_labels.push_back (i->label);
+       }
+
+       preset_labels.push_back("");
+
+       set_popdown_strings (_preset_combo, preset_labels);
+
+       --_no_load_preset;
+}
+
+void
+PlugUIBase::update_preset ()
+{
+       Plugin::PresetRecord p = plugin->last_preset();
+
+       ++_no_load_preset;
+       _preset_combo.set_active_text (p.label);
+       --_no_load_preset;
+
+       save_button.set_sensitive (!p.uri.empty() && p.user);
+       delete_button.set_sensitive (!p.uri.empty() && p.user);
+
+       update_preset_modified ();
+}
+
+void
+PlugUIBase::update_preset_modified ()
+{
+
+       if (plugin->last_preset().uri.empty()) {
+               _preset_modified.set_text ("");
+               return;
+       }
+
+       bool const c = plugin->parameter_changed_since_last_preset ();
+       if (_preset_modified.get_text().empty() == c) {
+               _preset_modified.set_text (c ? "*" : "");
        }
-       set_popdown_strings (preset_combo, preset_labels);
 }
+
+void
+PlugUIBase::parameter_changed (uint32_t, float)
+{
+       update_preset_modified ();
+}
+
+void
+PlugUIBase::preset_added_or_removed ()
+{
+       /* Update both the list and the currently-displayed preset */
+       update_preset_list ();
+       update_preset ();
+}
+