replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
[ardour.git] / gtk2_ardour / plugin_ui.cc
index 4423e3905dced33d360825f931aa25ab712c9e6b..8b0ce54dbc25569a7e598c518b0482f4c7220672 100644 (file)
 #include "pbd/xml++.h"
 #include "pbd/failed_constructor.h"
 
-#include <gtkmm/widget.h>
-#include <gtkmm/box.h>
-#include <gtkmm2ext/click_box.h>
-#include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/barcontroller.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/doi.h>
-#include <gtkmm2ext/slider_controller.h>
-#include <gtkmm2ext/application.h>
+#include "gtkmm/widget.h"
+#include "gtkmm/box.h"
+
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/doi.h"
+#include "gtkmm2ext/application.h"
+
+#include "widgets/tooltips.h"
+#include "widgets/fastmeter.h"
 
 #include "ardour/session.h"
 #include "ardour/plugin.h"
 #include "ardour/lxvst_plugin.h"
 #include "lxvst_plugin_ui.h"
 #endif
+#ifdef MACVST_SUPPORT
+#include "ardour/mac_vst_plugin.h"
+#include "vst_plugin_ui.h"
+#endif
 #ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
 #include "lv2_plugin_ui.h"
 
 #include "ardour_window.h"
 #include "ardour_ui.h"
-#include "prompter.h"
 #include "plugin_ui.h"
 #include "utils.h"
 #include "gui_thread.h"
 #include "public_editor.h"
+#include "processor_box.h"
 #include "keyboard.h"
 #include "latency_gui.h"
+#include "plugin_dspload_ui.h"
 #include "plugin_eq_gui.h"
+#include "timers.h"
 #include "new_plugin_preset_dialog.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
+using namespace ArdourWidgets;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
 
+
 PluginUIWindow::PluginUIWindow (
        boost::shared_ptr<PluginInsert> insert,
        bool                            scrollable,
@@ -85,8 +94,8 @@ PluginUIWindow::PluginUIWindow (
        , was_visible (false)
        , _keyboard_focused (false)
 #ifdef AUDIOUNIT_SUPPORT
-        , pre_deactivate_x (-1)
-        , pre_deactivate_y (-1)
+       , pre_deactivate_x (-1)
+       , pre_deactivate_y (-1)
 #endif
 
 {
@@ -99,11 +108,15 @@ PluginUIWindow::PluginUIWindow (
                case ARDOUR::Windows_VST:
                        have_gui = create_windows_vst_editor (insert);
                        break;
-                       
+
                case ARDOUR::LXVST:
                        have_gui = create_lxvst_editor (insert);
                        break;
 
+               case ARDOUR::MacVST:
+                       have_gui = create_mac_vst_editor (insert);
+                       break;
+
                case ARDOUR::AudioUnit:
                        have_gui = create_audiounit_editor (insert);
                        break;
@@ -159,7 +172,9 @@ PluginUIWindow::PluginUIWindow (
 
 PluginUIWindow::~PluginUIWindow ()
 {
+#ifndef NDEBUG
        cerr << "PluginWindow deleted for " << this << endl;
+#endif
        delete _pluginui;
 }
 
@@ -174,10 +189,10 @@ PluginUIWindow::on_show ()
        }
 
        if (_pluginui) {
-#if defined (HAVE_AUDIOUNITS) && defined(GTKOSX)
-                if (pre_deactivate_x >= 0) {                                                                             
-                        move (pre_deactivate_x, pre_deactivate_y);
-                }                                                      
+#if defined (HAVE_AUDIOUNITS) && defined(__APPLE__)
+               if (pre_deactivate_x >= 0) {
+                       move (pre_deactivate_x, pre_deactivate_y);
+               }
 #endif
 
                if (_pluginui->on_window_show (_title)) {
@@ -189,8 +204,8 @@ PluginUIWindow::on_show ()
 void
 PluginUIWindow::on_hide ()
 {
-#if defined (HAVE_AUDIOUNITS) && defined(GTKOSX)
-        get_position (pre_deactivate_x, pre_deactivate_y);                                                               
+#if defined (HAVE_AUDIOUNITS) && defined(__APPLE__)
+       get_position (pre_deactivate_x, pre_deactivate_y);
 #endif
 
        Window::on_hide ();
@@ -225,7 +240,7 @@ PluginUIWindow::create_windows_vst_editor(boost::shared_ptr<PluginInsert>)
                      << endmsg;
                throw failed_constructor ();
        } else {
-               WindowsVSTPluginUI* vpu = new WindowsVSTPluginUI (insert, vp);
+               WindowsVSTPluginUI* vpu = new WindowsVSTPluginUI (insert, vp, GTK_WIDGET(this->gobj()));
 
                _pluginui = vpu;
                _pluginui->KeyboardFocused.connect (sigc::mem_fun (*this, &PluginUIWindow::keyboard_focused));
@@ -267,6 +282,35 @@ PluginUIWindow::create_lxvst_editor(boost::shared_ptr<PluginInsert>)
 #endif
 }
 
+bool
+#ifdef MACVST_SUPPORT
+PluginUIWindow::create_mac_vst_editor (boost::shared_ptr<PluginInsert> insert)
+#else
+PluginUIWindow::create_mac_vst_editor (boost::shared_ptr<PluginInsert>)
+#endif
+{
+#ifndef MACVST_SUPPORT
+       return false;
+#else
+       boost::shared_ptr<MacVSTPlugin> mvst;
+       if ((mvst = boost::dynamic_pointer_cast<MacVSTPlugin> (insert->plugin())) == 0) {
+               error << string_compose (_("unknown type of editor-supplying plugin (note: no MacVST support in this version of %1)"), PROGRAM_NAME)
+                     << endmsg;
+               throw failed_constructor ();
+       }
+       VSTPluginUI* vpu = create_mac_vst_gui (insert);
+       _pluginui = vpu;
+       _pluginui->KeyboardFocused.connect (sigc::mem_fun (*this, &PluginUIWindow::keyboard_focused));
+       add (*vpu);
+       vpu->package (*this);
+
+       Application::instance()->ActivationChanged.connect (mem_fun (*this, &PluginUIWindow::app_activated));
+
+       return true;
+#endif
+}
+
+
 bool
 #ifdef AUDIOUNIT_SUPPORT
 PluginUIWindow::create_audiounit_editor (boost::shared_ptr<PluginInsert> insert)
@@ -289,7 +333,7 @@ PluginUIWindow::create_audiounit_editor (boost::shared_ptr<PluginInsert>)
 }
 
 void
-#ifdef GTKOSX
+#ifdef __APPLE__
 PluginUIWindow::app_activated (bool yn)
 #else
 PluginUIWindow::app_activated (bool)
@@ -300,15 +344,15 @@ PluginUIWindow::app_activated (bool)
                if (yn) {
                        if (was_visible) {
                                _pluginui->activate ();
-                                if (pre_deactivate_x >= 0) {
-                                        move (pre_deactivate_x, pre_deactivate_y);
-                                }
+                               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);
+                       get_position (pre_deactivate_x, pre_deactivate_y);
                        hide ();
                        _pluginui->deactivate ();
                }
@@ -330,6 +374,7 @@ PluginUIWindow::create_lv2_editor(boost::shared_ptr<PluginInsert> insert)
                _pluginui = lpu;
                add (*lpu);
                lpu->package (*this);
+               _pluginui->KeyboardFocused.connect (sigc::mem_fun (*this, &PluginUIWindow::keyboard_focused));
        }
 
        return true;
@@ -349,33 +394,34 @@ PluginUIWindow::on_key_press_event (GdkEventKey* event)
 {
        if (_keyboard_focused) {
                if (_pluginui) {
+                       _pluginui->grab_focus();
                        if (_pluginui->non_gtk_gui()) {
                                _pluginui->forward_key_event (event);
                        } else {
-                               return relay_key_press (event, this);
+                                       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 ...
-               */
+       }
+       /* 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);
-                       }
+       if (_pluginui) {
+               _pluginui->grab_focus();
+               if (_pluginui->non_gtk_gui()) {
+                       /* pass main 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, &ARDOUR_UI::instance()->main_window());
                } else {
-                       return false;
+                       return relay_key_press (event, this);
                }
        }
+
+       return false;
 }
 
 bool
@@ -386,12 +432,12 @@ PluginUIWindow::on_key_release_event (GdkEventKey *event)
                        if (_pluginui->non_gtk_gui()) {
                                _pluginui->forward_key_event (event);
                        }
-                       return true;
                }
-               return false;
        } else {
-               return true;
+               gtk_window_propagate_key_event (GTK_WINDOW(gobj()), event);
        }
+       /* don't forward releases */
+       return true;
 }
 
 void
@@ -412,40 +458,52 @@ PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi)
        , add_button (_("Add"))
        , save_button (_("Save"))
        , delete_button (_("Delete"))
+       , reset_button (_("Reset"))
        , bypass_button (ArdourButton::led_default_elements)
+       , pin_management_button (_("Pinout"))
        , description_expander (_("Description"))
        , plugin_analysis_expander (_("Plugin analysis"))
+       , cpuload_expander (_("CPU Profile"))
        , latency_gui (0)
        , latency_dialog (0)
        , eqgui (0)
+       , stats_gui (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"));
+       _preset_combo.set_text("(default)");
+       set_tooltip (_preset_combo, _("Presets (if any) for this plugin\n(Both factory and user-created)"));
+       set_tooltip (add_button, _("Save a new preset"));
+       set_tooltip (save_button, _("Save the current preset"));
+       set_tooltip (delete_button, _("Delete the current preset"));
+       set_tooltip (reset_button, _("Reset parameters to default (if no parameters are in automation play mode)"));
+       set_tooltip (pin_management_button, _("Show Plugin Pin Management Dialog"));
+       set_tooltip (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));
+       add_button.set_name ("generic button");
+       add_button.signal_clicked.connect (sigc::mem_fun (*this, &PlugUIBase::add_plugin_setting));
 
-       save_button.set_name ("PluginSaveButton");
-       save_button.signal_clicked().connect(sigc::mem_fun(*this, &PlugUIBase::save_plugin_setting));
+       save_button.set_name ("generic button");
+       save_button.signal_clicked.connect(sigc::mem_fun(*this, &PlugUIBase::save_plugin_setting));
 
-       delete_button.set_name ("PluginDeleteButton");
-       delete_button.signal_clicked().connect (sigc::mem_fun (*this, &PlugUIBase::delete_plugin_setting));
+       delete_button.set_name ("generic button");
+       delete_button.signal_clicked.connect (sigc::mem_fun (*this, &PlugUIBase::delete_plugin_setting));
+
+       reset_button.set_name ("generic button");
+       reset_button.signal_clicked.connect (sigc::mem_fun (*this, &PlugUIBase::reset_plugin_parameters));
+
+       pin_management_button.set_name ("generic button");
+       pin_management_button.signal_clicked.connect (sigc::mem_fun (*this, &PlugUIBase::manage_pins));
 
        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 ("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));
+       bypass_button.set_active (!pi->enabled ());
+       bypass_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PlugUIBase::bypass_button_release), false);
        focus_button.add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK);
 
        focus_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PlugUIBase::focus_toggled));
@@ -458,8 +516,8 @@ PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi)
 
        focus_button.add (*focus_out_image);
 
-       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"));
+       set_tooltip (focus_button, string_compose (_("Click to allow the plugin to receive keyboard events that %1 would normally use as a shortcut"), PROGRAM_NAME));
+       set_tooltip (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);
@@ -467,17 +525,25 @@ PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi)
        plugin_analysis_expander.property_expanded().signal_changed().connect( sigc::mem_fun(*this, &PlugUIBase::toggle_plugin_analysis));
        plugin_analysis_expander.set_expanded(false);
 
+       cpuload_expander.property_expanded().signal_changed().connect( sigc::mem_fun(*this, &PlugUIBase::toggle_cpuload_display));
+       cpuload_expander.set_expanded(false);
+
        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 ());
+       plugin->PresetDirty.connect (*this, invalidator (*this), boost::bind (&PlugUIBase::update_preset_modified, this), gui_context ());
+
+       insert->AutomationStateChanged.connect (*this, invalidator (*this), boost::bind (&PlugUIBase::automation_state_changed, this), gui_context());
+
+       automation_state_changed();
 }
 
 PlugUIBase::~PlugUIBase()
 {
        delete eqgui;
+       delete stats_gui;
        delete latency_gui;
 }
 
@@ -492,8 +558,8 @@ PlugUIBase::plugin_going_away ()
 void
 PlugUIBase::set_latency_label ()
 {
-       framecnt_t const l = insert->effective_latency ();
-       framecnt_t const sr = insert->session().frame_rate ();
+       samplecnt_t const l = insert->effective_latency ();
+       samplecnt_t const sr = insert->session().sample_rate ();
 
        string t;
 
@@ -503,14 +569,14 @@ PlugUIBase::set_latency_label ()
                t = string_compose (_("latency (%1 ms)"), (float) l / ((float) sr / 1000.0f));
        }
 
-       latency_label.set_text (t);
+       latency_button.set_text (t);
 }
 
 void
 PlugUIBase::latency_button_clicked ()
 {
        if (!latency_gui) {
-               latency_gui = new LatencyGUI (*(insert.get()), insert->session().frame_rate(), insert->session().get_block_size());
+               latency_gui = new LatencyGUI (*(insert.get()), insert->session().sample_rate(), insert->session().get_block_size());
                latency_dialog = new ArdourWindow (_("Edit Latency"));
                /* use both keep-above and transient for to try cover as many
                   different WM's as possible.
@@ -534,25 +600,18 @@ PlugUIBase::processor_active_changed (boost::weak_ptr<Processor> weak_p)
        boost::shared_ptr<Processor> p (weak_p.lock());
 
        if (p) {
-               bypass_button.set_active (!p->active());
+               bypass_button.set_active (!p->enabled ());
        }
 }
 
 void
-PlugUIBase::preset_selected ()
+PlugUIBase::preset_selected (Plugin::PresetRecord preset)
 {
        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);
-               } else {
-                       warning << string_compose(_("Plugin preset %1 not found"),
-                                                 _preset_combo.get_active_text()) << endmsg;
-               }
+       if (!preset.label.empty()) {
+               insert->load_preset (preset);
        } else {
                // blank selected = no preset
                plugin->clear_preset();
@@ -561,13 +620,26 @@ PlugUIBase::preset_selected ()
 
 #ifdef NO_PLUGIN_STATE
 static bool seen_saving_message = false;
+
+static void show_no_plugin_message()
+{
+       info << string_compose (_("Plugin presets are not supported in this build of %1. Consider paying for a full version"),
+                       PROGRAM_NAME)
+            << endmsg;
+       info << _("To get full access to updates without this limitation\n"
+                 "consider becoming a subscriber for a low cost every month.")
+            << endmsg;
+       info << X_("https://community.ardour.org/s/subscribe")
+            << endmsg;
+       ARDOUR_UI::instance()->popup_error(_("Plugin presets are not supported in this build, see the Log window for more information."));
+}
 #endif
 
 void
 PlugUIBase::add_plugin_setting ()
 {
 #ifndef NO_PLUGIN_STATE
-       NewPluginPresetDialog d (plugin);
+       NewPluginPresetDialog d (plugin, _("New Preset"));
 
        switch (d.run ()) {
        case Gtk::RESPONSE_ACCEPT:
@@ -585,12 +657,10 @@ PlugUIBase::add_plugin_setting ()
                }
                break;
        }
-#else 
+#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;
+               show_no_plugin_message();
        }
 #endif
 }
@@ -599,18 +669,16 @@ void
 PlugUIBase::save_plugin_setting ()
 {
 #ifndef NO_PLUGIN_STATE
-       string const name = _preset_combo.get_active_text ();
+       string const name = _preset_combo.get_text ();
        plugin->remove_preset (name);
        Plugin::PresetRecord const r = plugin->save_preset (name);
        if (!r.uri.empty ()) {
                plugin->load_preset (r);
        }
-#else 
+#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;
+               show_no_plugin_message();
        }
 #endif
 }
@@ -619,28 +687,45 @@ void
 PlugUIBase::delete_plugin_setting ()
 {
 #ifndef NO_PLUGIN_STATE
-       plugin->remove_preset (_preset_combo.get_active_text ());
+       plugin->remove_preset (_preset_combo.get_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;
+               show_no_plugin_message();
        }
 #endif
 }
 
+void
+PlugUIBase::automation_state_changed ()
+{
+       reset_button.set_sensitive (insert->can_reset_all_parameters());
+}
+
+void
+PlugUIBase::reset_plugin_parameters ()
+{
+       insert->reset_parameters_to_default ();
+}
+
+void
+PlugUIBase::manage_pins ()
+{
+       PluginPinWindowProxy* proxy = insert->pinmgr_proxy ();
+       if (proxy) {
+               proxy->get (true);
+               proxy->present ();
+               proxy->get ()->raise();
+       }
+}
+
 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 ();
-               }
+
+       if (view_says_bypassed != insert->enabled ()) {
+               insert->enable (view_says_bypassed);
        }
 
        return false;
@@ -654,14 +739,14 @@ PlugUIBase::focus_toggled (GdkEventButton*)
                focus_button.remove ();
                focus_button.add (*focus_out_image);
                focus_out_image->show ();
-               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));
+               set_tooltip (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, string_compose (_("Click to allow normal use of %1 keyboard shortcuts"), PROGRAM_NAME));
+               set_tooltip (focus_button, string_compose (_("Click to allow normal use of %1 keyboard shortcuts"), PROGRAM_NAME));
                KeyboardFocused (true);
        }
 
@@ -684,13 +769,23 @@ PlugUIBase::toggle_description()
                description_expander.add(*label);
                description_expander.show_all();
        }
-       
+
        if (!description_expander.get_expanded()) {
+               const int child_height = description_expander.get_child ()->get_height ();
+
                description_expander.remove();
+
+               Gtk::Window *toplevel = (Gtk::Window*) description_expander.get_ancestor (GTK_TYPE_WINDOW);
+
+               if (toplevel) {
+                       Gtk::Requisition wr;
+                       toplevel->get_size (wr.width, wr.height);
+                       wr.height -= child_height;
+                       toplevel->resize (wr.width, wr.height);
+               }
        }
 }
 
-
 void
 PlugUIBase::toggle_plugin_analysis()
 {
@@ -701,12 +796,6 @@ PlugUIBase::toggle_plugin_analysis()
                        eqgui = new PluginEqGui (insert);
                }
 
-               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);
-               }
-
                plugin_analysis_expander.add (*eqgui);
                plugin_analysis_expander.show_all ();
                eqgui->start_listening ();
@@ -714,6 +803,7 @@ PlugUIBase::toggle_plugin_analysis()
 
        if (!plugin_analysis_expander.get_expanded()) {
                // Hide & remove from expander
+               const int child_height = plugin_analysis_expander.get_child ()->get_height ();
 
                eqgui->hide ();
                eqgui->stop_listening ();
@@ -722,26 +812,65 @@ PlugUIBase::toggle_plugin_analysis()
                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);
+                       Gtk::Requisition wr;
+                       toplevel->get_size (wr.width, wr.height);
+                       wr.height -= child_height;
+                       toplevel->resize (wr.width, wr.height);
+               }
+       }
+}
+
+void
+PlugUIBase::toggle_cpuload_display()
+{
+       if (cpuload_expander.get_expanded() && !cpuload_expander.get_child()) {
+               if (stats_gui == 0) {
+                       stats_gui = new PluginLoadStatsGui (insert);
+               }
+               cpuload_expander.add (*stats_gui);
+               cpuload_expander.show_all();
+               stats_gui->start_updating ();
+       }
+
+       if (!cpuload_expander.get_expanded()) {
+               const int child_height = cpuload_expander.get_child ()->get_height ();
+
+               stats_gui->hide ();
+               stats_gui->stop_updating ();
+               cpuload_expander.remove();
+
+               Gtk::Window *toplevel = (Gtk::Window*) cpuload_expander.get_ancestor (GTK_TYPE_WINDOW);
+
+               if (toplevel) {
+                       Gtk::Requisition wr;
+                       toplevel->get_size (wr.width, wr.height);
+                       wr.height -= child_height;
+                       toplevel->resize (wr.width, wr.height);
                }
        }
+
 }
 
 void
 PlugUIBase::update_preset_list ()
 {
-       vector<string> preset_labels;
+       using namespace Menu_Helpers;
+
        vector<ARDOUR::Plugin::PresetRecord> presets = plugin->get_presets();
 
        ++_no_load_preset;
 
+       // Add a menu entry for each preset
+       _preset_combo.clear_items();
        for (vector<ARDOUR::Plugin::PresetRecord>::const_iterator i = presets.begin(); i != presets.end(); ++i) {
-               preset_labels.push_back (i->label);
+               _preset_combo.AddMenuElem(
+                       MenuElem(i->label, sigc::bind(sigc::mem_fun(*this, &PlugUIBase::preset_selected), *i)));
        }
 
-       preset_labels.push_back("");
-
-       set_popdown_strings (_preset_combo, preset_labels);
+       // Add an empty entry for un-setting current preset (see preset_selected)
+       Plugin::PresetRecord no_preset;
+       _preset_combo.AddMenuElem(
+               MenuElem("", sigc::bind(sigc::mem_fun(*this, &PlugUIBase::preset_selected), no_preset)));
 
        --_no_load_preset;
 }
@@ -752,20 +881,24 @@ PlugUIBase::update_preset ()
        Plugin::PresetRecord p = plugin->last_preset();
 
        ++_no_load_preset;
-       _preset_combo.set_active_text (p.label);
+       if (p.uri.empty()) {
+               _preset_combo.set_text (_("(none)"));
+       } else {
+               _preset_combo.set_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 ()
 {
+       Plugin::PresetRecord p = plugin->last_preset();
 
-       if (plugin->last_preset().uri.empty()) {
+       if (p.uri.empty()) {
+               save_button.set_sensitive (false);
                _preset_modified.set_text ("");
                return;
        }
@@ -774,12 +907,7 @@ PlugUIBase::update_preset_modified ()
        if (_preset_modified.get_text().empty() == c) {
                _preset_modified.set_text (c ? "*" : "");
        }
-}
-
-void
-PlugUIBase::parameter_changed (uint32_t, float)
-{
-       update_preset_modified ();
+       save_button.set_sensitive (c && p.user);
 }
 
 void