use modified API name in GUI
[ardour.git] / gtk2_ardour / processor_box.cc
index 34bcbf28b5fe550b38f72da8e3d4c4d52b58e915..18b4b50ef1958cb0cc90939be7908fa54db0e678 100644 (file)
 
 #include <sigc++/bind.h>
 
-#include "canvas/utils.h"
-
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 
 #include <gtkmm/messagedialog.h>
 
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/choice.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/doi.h>
-#include <gtkmm2ext/rgb_macros.h>
+#include "gtkmm2ext/colors.h"
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/menu_elems.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/doi.h"
+#include "gtkmm2ext/rgb_macros.h"
+
+#include "widgets/choice.h"
+#include "widgets/prompter.h"
+#include "widgets/tooltips.h"
 
 #include "ardour/amp.h"
 #include "ardour/audio_track.h"
@@ -59,6 +61,7 @@
 #include "ardour/send.h"
 #include "ardour/session.h"
 #include "ardour/types.h"
+#include "ardour/value_as_string.h"
 
 #include "LuaBridge/LuaBridge.h"
 
@@ -82,7 +85,6 @@
 #include "script_selector.h"
 #include "send_ui.h"
 #include "timers.h"
-#include "tooltips.h"
 #include "new_plugin_preset_dialog.h"
 
 #include "pbd/i18n.h"
@@ -101,6 +103,7 @@ using namespace PBD;
 using namespace Gtk;
 using namespace Glib;
 using namespace Gtkmm2ext;
+using namespace ArdourWidgets;
 
 ProcessorBox*  ProcessorBox::_current_processor_box = 0;
 RefPtr<Action> ProcessorBox::paste_action;
@@ -110,6 +113,7 @@ RefPtr<Action> ProcessorBox::rename_action;
 RefPtr<Action> ProcessorBox::delete_action;
 RefPtr<Action> ProcessorBox::backspace_action;
 RefPtr<Action> ProcessorBox::manage_pins_action;
+RefPtr<Action> ProcessorBox::disk_io_action;
 RefPtr<Action> ProcessorBox::edit_action;
 RefPtr<Action> ProcessorBox::edit_generic_action;
 RefPtr<ActionGroup> ProcessorBox::processor_box_actions;
@@ -181,7 +185,7 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processo
                boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (_processor);
                if (pi && pi->plugin() && pi->plugin()->has_inline_display()) {
                        if (pi->plugin()->get_info()->type != ARDOUR::Lua) {
-                               _plugin_display = new PluginDisplay (*this, pi->plugin(),
+                               _plugin_display = new PluginInlineDisplay (*this, pi->plugin(),
                                                std::max (60.f, rintf(112.f * UIConfiguration::instance().get_ui_scale())));
                        } else {
                                assert (boost::dynamic_pointer_cast<LuaProc>(pi->plugin()));
@@ -514,10 +518,10 @@ ProcessorEntry::setup_tooltip ()
                        }
 
                        if (pi->plugin()->has_editor()) {
-                               ARDOUR_UI_UTILS::set_tooltip (_button,
+                               set_tooltip (_button,
                                                string_compose (_("<b>%1</b>\nDouble-click to show GUI.\n%2+double-click to show generic GUI.%3"), name (Wide), Keyboard::secondary_modifier_name (), postfix));
                        } else {
-                               ARDOUR_UI_UTILS::set_tooltip (_button,
+                               set_tooltip (_button,
                                                string_compose (_("<b>%1</b>\nDouble-click to show generic GUI.%2"), name (Wide), postfix));
                        }
                        return;
@@ -531,14 +535,14 @@ ProcessorEntry::setup_tooltip ()
                if ((send = boost::dynamic_pointer_cast<Send> (_processor)) != 0 &&
                                !boost::dynamic_pointer_cast<InternalSend>(_processor)) {
                        if (send->remove_on_disconnect ()) {
-                               ARDOUR_UI_UTILS::set_tooltip (_button, string_compose ("<b>&gt; %1</b>\nThis (sidechain) send will be removed when disconnected.", _processor->name()));
+                               set_tooltip (_button, string_compose ("<b>&gt; %1</b>\nThis (sidechain) send will be removed when disconnected.", _processor->name()));
                        } else {
-                               ARDOUR_UI_UTILS::set_tooltip (_button, string_compose ("<b>&gt; %1</b>", _processor->name()));
+                               set_tooltip (_button, string_compose ("<b>&gt; %1</b>", _processor->name()));
                        }
                        return;
                }
        }
-       ARDOUR_UI_UTILS::set_tooltip (_button, string_compose ("<b>%1</b>", name (Wide)));
+       set_tooltip (_button, string_compose ("<b>%1</b>", name (Wide)));
 }
 
 string
@@ -727,7 +731,7 @@ ProcessorEntry::build_controls_menu ()
        }
 
        for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
-               items.push_back (CheckMenuElem ((*i)->name ()));
+               items.push_back (CheckMenuElemNoMnemonic ((*i)->name ()));
                Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
                c->set_active ((*i)->visible ());
                c->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &ProcessorEntry::toggle_control_visibility), *i));
@@ -821,8 +825,11 @@ ProcessorEntry::Control::Control (boost::shared_ptr<AutomationControl> c, string
 
                _button.signal_clicked.connect (sigc::mem_fun (*this, &Control::button_clicked));
                _button.signal_led_clicked.connect (sigc::mem_fun (*this, &Control::button_clicked_event));
-               // dup. currently timers are used :(
-               //c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ());
+               c->Changed.connect (_connections, invalidator (*this), boost::bind (&Control::control_changed, this), gui_context ());
+               if (c->alist ()) {
+                       c->alist()->automation_state_changed.connect (_connections, invalidator (*this), boost::bind (&Control::control_automation_state_changed, this), gui_context());
+                       control_automation_state_changed ();
+               }
 
        } else {
 
@@ -833,23 +840,11 @@ ProcessorEntry::Control::Control (boost::shared_ptr<AutomationControl> c, string
                _slider.show ();
 
                const ARDOUR::ParameterDescriptor& desc = c->desc();
-               double const lo = c->internal_to_interface(desc.lower);
-               double const up = c->internal_to_interface(desc.upper);
-               double const normal = c->internal_to_interface(desc.normal);
-               double smallstep = desc.smallstep;
-               double largestep = desc.largestep;
-
-               if (smallstep == 0.0) {
-                       smallstep = up / 1000.;
-               } else {
-                       smallstep = c->internal_to_interface(desc.lower + smallstep);
-               }
-
-               if (largestep == 0.0) {
-                       largestep = up / 40.;
-               } else {
-                       largestep = c->internal_to_interface(desc.lower + largestep);
-               }
+               double const lo        = c->internal_to_interface (desc.lower);
+               double const up        = c->internal_to_interface (desc.upper);
+               double const normal    = c->internal_to_interface (desc.normal);
+               double const smallstep = c->internal_to_interface (desc.lower + desc.smallstep);
+               double const largestep = c->internal_to_interface (desc.lower + desc.largestep);
 
                _adjustment.set_lower (lo);
                _adjustment.set_upper (up);
@@ -857,15 +852,17 @@ ProcessorEntry::Control::Control (boost::shared_ptr<AutomationControl> c, string
                _adjustment.set_page_increment (largestep);
                _slider.set_default_value (normal);
 
+               _slider.StartGesture.connect(sigc::mem_fun(*this, &Control::start_touch));
+               _slider.StopGesture.connect(sigc::mem_fun(*this, &Control::end_touch));
+
                _adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &Control::slider_adjusted));
-               // dup. currently timers are used :(
-               //c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ());
+               c->Changed.connect (_connections, invalidator (*this), boost::bind (&Control::control_changed, this), gui_context ());
+               if (c->alist ()) {
+                       c->alist()->automation_state_changed.connect (_connections, invalidator (*this), boost::bind (&Control::control_automation_state_changed, this), gui_context());
+                       control_automation_state_changed ();
+               }
        }
 
-       // yuck, do we really need to do this?
-       // according to c404374 this is only needed for send automation
-       timer_connection = Timers::rapid_connect (sigc::mem_fun (*this, &Control::control_changed));
-
        control_changed ();
        set_tooltip ();
 
@@ -875,7 +872,6 @@ ProcessorEntry::Control::Control (boost::shared_ptr<AutomationControl> c, string
 
 ProcessorEntry::Control::~Control ()
 {
-       timer_connection.disconnect ();
 }
 
 void
@@ -886,16 +882,10 @@ ProcessorEntry::Control::set_tooltip ()
        if (!c) {
                return;
        }
-       char tmp[256];
-       if (c->toggled ()) {
-               snprintf (tmp, sizeof(tmp), "%s: %s", _name.c_str(), c->get_value() > 0.5 ? _("on") : _("off"));
-       } else {
-               snprintf (tmp, sizeof(tmp), "%s: %.2f", _name.c_str(), c->internal_to_user (c->get_value ()));
-       }
-
-       string sm = Gtkmm2ext::markup_escape_text (tmp);
+       std::string tt = _name + ": " + ARDOUR::value_as_string (c->desc(), c->get_value ());
+       string sm = Gtkmm2ext::markup_escape_text (tt);
        _slider_persistant_tooltip.set_tip (sm);
-       ARDOUR_UI_UTILS::set_tooltip (_button, sm);
+       ArdourWidgets::set_tooltip (_button, Gtkmm2ext::markup_escape_text (sm));
 }
 
 void
@@ -915,6 +905,26 @@ ProcessorEntry::Control::slider_adjusted ()
        set_tooltip ();
 }
 
+void
+ProcessorEntry::Control::start_touch ()
+{
+       boost::shared_ptr<AutomationControl> c = _control.lock ();
+       if (!c) {
+               return;
+       }
+       c->start_touch (c->session().transport_frame());
+}
+
+void
+ProcessorEntry::Control::end_touch ()
+{
+       boost::shared_ptr<AutomationControl> c = _control.lock ();
+       if (!c) {
+               return;
+       }
+       c->stop_touch (c->session().transport_frame());
+}
+
 void
 ProcessorEntry::Control::button_clicked ()
 {
@@ -939,6 +949,21 @@ ProcessorEntry::Control::button_clicked_event (GdkEventButton *ev)
        button_clicked ();
 }
 
+void
+ProcessorEntry::Control::control_automation_state_changed ()
+{
+       boost::shared_ptr<AutomationControl> c = _control.lock ();
+       if (!c) {
+               return;
+       }
+       bool x = c->alist()->automation_state() & Play;
+       if (c->toggled ()) {
+               _button.set_sensitive (!x);
+       } else {
+               _slider.set_sensitive (!x);
+       }
+}
+
 void
 ProcessorEntry::Control::control_changed ()
 {
@@ -950,12 +975,9 @@ ProcessorEntry::Control::control_changed ()
        _ignore_ui_adjustment = true;
 
        if (c->toggled ()) {
-
                _button.set_active (c->get_value() > 0.5);
-
        } else {
-               // as long as rapid timers are used, only update the tooltip
-               // if the value has changed.
+               // Note: the _slider watches the controllable by itself
                const double nval = c->internal_to_interface (c->get_value ());
                if (_adjustment.get_value() != nval) {
                        _adjustment.set_value (nval);
@@ -1542,40 +1564,25 @@ ProcessorEntry::RoutingIcon::expose_output_map (cairo_t* cr, const double width,
        }
 }
 
-ProcessorEntry::PluginDisplay::PluginDisplay (ProcessorEntry& e, boost::shared_ptr<ARDOUR::Plugin> p, uint32_t max_height)
-       : _entry (e)
-       , _plug (p)
-       , _surf (0)
-       , _max_height (max_height)
-       , _cur_height (1)
+ProcessorEntry::PluginInlineDisplay::PluginInlineDisplay (ProcessorEntry& e, boost::shared_ptr<ARDOUR::Plugin> p, uint32_t max_height)
+       : PluginDisplay (p, max_height)
+       , _entry (e)
        , _scroll (false)
 {
-       set_name ("processor prefader");
-       add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-       _plug->DropReferences.connect (_death_connection, invalidator (*this), boost::bind (&PluginDisplay::plugin_going_away, this), gui_context());
-       _plug->QueueDraw.connect (_qdraw_connection, invalidator (*this),
-                       boost::bind (&Gtk::Widget::queue_draw, this), gui_context ());
-
        std::string postfix = string_compose(_("\n%1+double-click to toggle inline-display"), Keyboard::tertiary_modifier_name ());
 
        if (_plug->has_editor()) {
-               ARDOUR_UI_UTILS::set_tooltip (*this,
+               set_tooltip (*this,
                                string_compose (_("<b>%1</b>\nDouble-click to show GUI.\n%2+double-click to show generic GUI.%3"), e.name (Wide), Keyboard::primary_modifier_name (), postfix));
        } else {
-               ARDOUR_UI_UTILS::set_tooltip (*this,
+               set_tooltip (*this,
                                string_compose (_("<b>%1</b>\nDouble-click to show generic GUI.%2"), e.name (Wide), postfix));
        }
 }
 
-ProcessorEntry::PluginDisplay::~PluginDisplay ()
-{
-       if (_surf) {
-               cairo_surface_destroy (_surf);
-       }
-}
 
 bool
-ProcessorEntry::PluginDisplay::on_button_press_event (GdkEventButton *ev)
+ProcessorEntry::PluginInlineDisplay::on_button_press_event (GdkEventButton *ev)
 {
        assert (_entry.processor ());
 
@@ -1602,14 +1609,8 @@ ProcessorEntry::PluginDisplay::on_button_press_event (GdkEventButton *ev)
        return false;
 }
 
-bool
-ProcessorEntry::PluginDisplay::on_button_release_event (GdkEventButton *ev)
-{
-       return false;
-}
-
 void
-ProcessorEntry::PluginDisplay::on_size_request (Requisition* req)
+ProcessorEntry::PluginInlineDisplay::on_size_request (Requisition* req)
 {
        req->width = 56;
        req->height = _cur_height;
@@ -1617,7 +1618,7 @@ ProcessorEntry::PluginDisplay::on_size_request (Requisition* req)
 
 
 void
-ProcessorEntry::PluginDisplay::update_height_alloc (uint32_t inline_height)
+ProcessorEntry::PluginInlineDisplay::update_height_alloc (uint32_t inline_height)
 {
        /* work-around scroll-bar + aspect ratio
         * show inline-view -> height changes -> scrollbar gets added
@@ -1646,105 +1647,14 @@ ProcessorEntry::PluginDisplay::update_height_alloc (uint32_t inline_height)
        _scroll = sc;
 }
 
-uint32_t
-ProcessorEntry::PluginDisplay::render_inline (cairo_t* cr, uint32_t width)
+void
+ProcessorEntry::PluginInlineDisplay::display_frame (cairo_t* cr, double w, double h)
 {
-       Plugin::Display_Image_Surface* dis = _plug->render_inline_display (width, _max_height);
-       if (!dis) {
-               return 0;
-       }
-
-       /* allocate a local image-surface,
-        * We cannot re-use the data via cairo_image_surface_create_for_data(),
-        * since pixman keeps a reference to it.
-        * we'd need to hand over the data and ha cairo_surface_destroy to free it.
-        * it might be possible to work around via cairo_surface_set_user_data().
-        */
-       if (!_surf
-                       || dis->width !=  cairo_image_surface_get_width (_surf)
-                       || dis->height !=  cairo_image_surface_get_height (_surf)
-                ) {
-               if (_surf) {
-                       cairo_surface_destroy (_surf);
-               }
-               _surf = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, dis->width, dis->height);
-       }
-
-       if (cairo_image_surface_get_stride (_surf) == dis->stride) {
-               memcpy (cairo_image_surface_get_data (_surf), dis->data, dis->stride * dis->height);
-       } else {
-               unsigned char *src = dis->data;
-               unsigned char *dst = cairo_image_surface_get_data (_surf);
-               const int dst_stride =  cairo_image_surface_get_stride (_surf);
-               for (int y = 0; y < dis->height; ++y) {
-                       memcpy (dst, src, dis->width * 4 /*ARGB32*/);
-                       src += dis->stride;
-                       dst += dst_stride;
-               }
-       }
-
-       cairo_surface_flush(_surf);
-       cairo_surface_mark_dirty(_surf);
-       const double xc = floor ((width - dis->width) * .5);
-       cairo_set_source_surface(cr, _surf, xc, 0);
-       cairo_paint (cr);
-
-       return dis->height;
-}
-
-bool
-ProcessorEntry::PluginDisplay::on_expose_event (GdkEventExpose* ev)
-{
-       Gtk::Allocation a = get_allocation();
-       double const width = a.get_width();
-       double const height = a.get_height();
-
-       cairo_t* cr = gdk_cairo_create (get_window()->gobj());
-       cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
-       cairo_clip (cr);
-
-       Gdk::Color const bg = get_style()->get_bg (STATE_NORMAL);
-       cairo_set_source_rgb (cr, bg.get_red_p (), bg.get_green_p (), bg.get_blue_p ());
-       cairo_rectangle (cr, 0, 0, width, height);
-       cairo_fill (cr);
-
-       cairo_save (cr);
-       cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-       Gtkmm2ext::rounded_rectangle (cr, .5, -1.5, width - 1, height + 1, 7);
-       cairo_clip (cr);
-       cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-
-       uint32_t ht = render_inline (cr, width);
-       cairo_restore (cr);
-
-       if (ht == 0) {
-               hide ();
-               if (_cur_height != 1) {
-                       _cur_height = 1;
-                       queue_resize ();
-               }
-               cairo_destroy (cr);
-               return true;
-       } else {
-               update_height_alloc (ht);
-       }
-
-       bool failed = false;
-       std::string name = get_name();
-       ArdourCanvas::Color fill_color = UIConfiguration::instance().color (string_compose ("%1: fill active", name), &failed);
-
-       Gtkmm2ext::rounded_rectangle (cr, .5, -1.5, width - 1, height + 1, 7);
-       cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-       cairo_set_line_width(cr, 1.0);
-       ArdourCanvas::set_source_rgb_a (cr, fill_color, 1.0);
-       cairo_stroke (cr);
-
-       cairo_destroy(cr);
-       return true;
+       Gtkmm2ext::rounded_rectangle (cr, .5, -1.5, w - 1, h + 1, 7);
 }
 
 ProcessorEntry::LuaPluginDisplay::LuaPluginDisplay (ProcessorEntry& e, boost::shared_ptr<ARDOUR::LuaProc> p, uint32_t max_height)
-       : PluginDisplay (e, p, max_height)
+       : PluginInlineDisplay (e, p, max_height)
        , _luaproc (p)
        , _lua_render_inline (0)
 {
@@ -1777,7 +1687,7 @@ ProcessorEntry::LuaPluginDisplay::render_inline (cairo_t *cr, uint32_t width)
 #ifndef NDEBUG
                cerr << "LuaException:" << e.what () << endl;
 #endif
-       }
+       } catch (...) { }
        return 0;
 }
 
@@ -1813,7 +1723,6 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelecto
        , ab_direction (true)
        , _get_plugin_selector (get_plugin_selector)
        , _placement (-1)
-       , _visible_prefader_processors (0)
        , _p_selection(psel)
        , processor_display (drop_targets())
        , _redisplay_pending (false)
@@ -1860,7 +1769,7 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelecto
                        );
        }
 
-       ARDOUR_UI_UTILS::set_tooltip (processor_display, _("Right-click to add/remove/edit\nplugins,inserts,sends and more"));
+       set_tooltip (processor_display, _("Right-click to add/remove/edit\nplugins,inserts,sends and more"));
 }
 
 ProcessorBox::~ProcessorBox ()
@@ -2036,7 +1945,7 @@ ProcessorBox::object_drop (DnDVBox<ProcessorEntry>* source, ProcessorEntry* posi
                 * otherwise we'll end up with duplicate ports-names.
                 * (this needs a better solution which retains connections)
                 */
-               state.remove_nodes ("Processor");
+               state.remove_nodes_and_delete ("Processor");
                proc->set_state (state, Stateful::loading_state_version);
                boost::dynamic_pointer_cast<PluginInsert>(proc)->update_id (id);
                return;
@@ -2044,7 +1953,7 @@ ProcessorBox::object_drop (DnDVBox<ProcessorEntry>* source, ProcessorEntry* posi
 
        boost::shared_ptr<Processor> p = find_drop_position (position);
 
-       list<ProcessorEntry*> children = source->selection ();
+       list<ProcessorEntry*> children = source->selection (true);
        list<boost::shared_ptr<Processor> > procs;
        for (list<ProcessorEntry*>::const_iterator i = children.begin(); i != children.end(); ++i) {
                if ((*i)->processor ()) {
@@ -2112,7 +2021,7 @@ ProcessorBox::build_possible_aux_menu ()
 
        for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) {
                if (!_route->internal_send_for (*r) && *r != _route) {
-                       items.push_back (MenuElem ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), boost::weak_ptr<Route>(*r))));
+                       items.push_back (MenuElemNoMnemonic ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), boost::weak_ptr<Route>(*r))));
                }
        }
 
@@ -2197,7 +2106,6 @@ ProcessorBox::show_processor_menu (int arg)
 
        /* Sensitise actions as approprioate */
 
-
        const bool sensitive = !processor_display.selection().empty() && ! stub_processor_selected ();
 
        paste_action->set_sensitive (!_p_selection.processors.empty());
@@ -2215,6 +2123,11 @@ ProcessorBox::show_processor_menu (int arg)
        }
 
        manage_pins_action->set_sensitive (pi != 0);
+       if (boost::dynamic_pointer_cast<Track>(_route)) {
+               disk_io_action->set_sensitive (true);
+       } else {
+               disk_io_action->set_sensitive (false);
+       }
 
        /* allow editing with an Ardour-generated UI for plugin inserts with editors */
        edit_action->set_sensitive (pi && pi->plugin()->has_editor ());
@@ -2233,10 +2146,6 @@ ProcessorBox::show_processor_menu (int arg)
        int x, y;
        processor_display.get_pointer (x, y);
        _placement = processor_display.add_placeholder (y);
-
-       if (_visible_prefader_processors == 0 && _placement > 0) {
-               --_placement;
-       }
 }
 
 bool
@@ -2497,6 +2406,11 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins)
                                }
                        }
                }
+               /* add next processor below the currently added.
+                * Note: placement < 0: add the bottom */
+               if (_placement >= 0) {
+                       ++_placement;
+               }
        }
 
        return false;
@@ -2686,7 +2600,6 @@ void
 ProcessorBox::redisplay_processors ()
 {
        ENSURE_GUI_THREAD (*this, &ProcessorBox::redisplay_processors);
-       bool     fader_seen;
 
        if (no_processor_redisplay) {
                return;
@@ -2694,12 +2607,6 @@ ProcessorBox::redisplay_processors ()
 
        processor_display.clear ();
 
-       _visible_prefader_processors = 0;
-       fader_seen = false;
-
-       _route->foreach_processor (sigc::bind (sigc::mem_fun (*this, &ProcessorBox::help_count_visible_prefader_processors),
-                                              &_visible_prefader_processors, &fader_seen));
-
        _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::add_processor_to_display));
        _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::maybe_add_processor_to_ui_list));
        _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::maybe_add_processor_pin_mgr));
@@ -2749,12 +2656,6 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr<Processor> w)
                wp->set_state (*ui_xml, 0);
        }
 
-        void* existing_ui = p->get_ui ();
-
-        if (existing_ui) {
-                wp->use_window (*(reinterpret_cast<Gtk::Window*>(existing_ui)));
-        }
-
        p->set_window_proxy (wp);
        WM::Manager::instance().register_window (wp);
 }
@@ -2779,28 +2680,6 @@ ProcessorBox::maybe_add_processor_pin_mgr (boost::weak_ptr<Processor> w)
        p->set_pingmgr_proxy (wp);
        WM::Manager::instance().register_window (wp);
 }
-void
-ProcessorBox::help_count_visible_prefader_processors (boost::weak_ptr<Processor> p, uint32_t* cnt, bool* amp_seen)
-{
-       boost::shared_ptr<Processor> processor (p.lock ());
-
-       if (processor && ( processor->display_to_user()
-#ifndef NDEBUG
-                           || show_all_processors
-#endif
-                        )
-          ) {
-
-               if (boost::dynamic_pointer_cast<Amp>(processor) &&
-                   boost::dynamic_pointer_cast<Amp>(processor)->gain_control()->parameter().type() == GainAutomation) {
-                       *amp_seen = true;
-               } else {
-                       if (!*amp_seen) {
-                               (*cnt)++;
-                       }
-               }
-       }
-}
 
 void
 ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
@@ -3259,7 +3138,7 @@ ProcessorBox::idle_delete_processor (boost::weak_ptr<Processor> weak_processor)
 void
 ProcessorBox::rename_processor (boost::shared_ptr<Processor> processor)
 {
-       ArdourPrompter name_prompter (true);
+       Prompter name_prompter (true);
        string result;
        name_prompter.set_title (_("Rename Processor"));
        name_prompter.set_prompt (_("New name:"));
@@ -3274,26 +3153,26 @@ ProcessorBox::rename_processor (boost::shared_ptr<Processor> processor)
                name_prompter.get_result (result);
                if (result.length()) {
 
-                       int tries = 0;
-                       string test = result;
-
-                       while (tries < 100) {
-                               if (_session->io_name_is_legal (test)) {
-                                       result = test;
-                                       break;
-                               }
-                               tries++;
-
-                               test = string_compose ("%1-%2", result, tries);
-                       }
-
-                       if (tries < 100) {
-                               processor->set_name (result);
-                       } else {
-                               /* unlikely! */
-                               ARDOUR_UI::instance()->popup_error
-                                       (string_compose (_("At least 100 IO objects exist with a name like %1 - name not changed"), result));
-                       }
+                       int tries = 0;
+                       string test = result;
+
+                       while (tries < 100) {
+                               if (_session->io_name_is_legal (test)) {
+                                       result = test;
+                                       break;
+                               }
+                               tries++;
+
+                               test = string_compose ("%1-%2", result, tries);
+                       }
+
+                       if (tries < 100) {
+                               processor->set_name (result);
+                       } else {
+                               /* unlikely! */
+                               ARDOUR_UI::instance()->popup_error
+                                      (string_compose (_("At least 100 IO objects exist with a name like %1 - name not changed"), result));
+                       }
                }
                break;
        }
@@ -3366,10 +3245,10 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
 
                                IOProcessor::prepare_for_reset (n, s->name());
 
-                                if (s->set_state (n, Stateful::loading_state_version)) {
-                                        delete s;
-                                        return;
-                                }
+                               if (s->set_state (n, Stateful::loading_state_version)) {
+                                       delete s;
+                                       return;
+                               }
 
                                p.reset (s);
 
@@ -3382,24 +3261,24 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
 
                                IOProcessor::prepare_for_reset (n, s->name());
 
-                                if (s->set_state (n, Stateful::loading_state_version)) {
-                                        delete s;
-                                        return;
-                                }
+                               if (s->set_state (n, Stateful::loading_state_version)) {
+                                       delete s;
+                                       return;
+                               }
 
                                p.reset (s);
 
                        } else if (type->value() == "return") {
 
                                XMLNode n (**niter);
-                                Return* r = new Return (*_session);
+                               Return* r = new Return (*_session);
 
                                IOProcessor::prepare_for_reset (n, r->name());
 
-                                if (r->set_state (n, Stateful::loading_state_version)) {
-                                        delete r;
-                                        return;
-                                }
+                               if (r->set_state (n, Stateful::loading_state_version)) {
+                                       delete r;
+                                       return;
+                               }
 
                                p.reset (r);
 
@@ -3433,7 +3312,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
                                 * We really would want Stateful::ForceIDRegeneration here :(
                                 */
                                XMLNode state (**niter);
-                               state.remove_nodes ("Processor");
+                               state.remove_nodes_and_delete ("Processor");
 
                                p->set_state (state, Stateful::current_state_version);
                                boost::dynamic_pointer_cast<PluginInsert>(p)->update_id (id);
@@ -3465,7 +3344,7 @@ could not match the configuration of this track.");
 void
 ProcessorBox::get_selected_processors (ProcSelection& processors) const
 {
-       const list<ProcessorEntry*> selection = processor_display.selection ();
+       const list<ProcessorEntry*> selection = processor_display.selection (true);
        for (list<ProcessorEntry*>::const_iterator i = selection.begin(); i != selection.end(); ++i) {
                processors.push_back ((*i)->processor ());
        }
@@ -3493,6 +3372,14 @@ ProcessorBox::ab_plugins ()
        ab_direction = !ab_direction;
 }
 
+void
+ProcessorBox::set_disk_io_position (DiskIOPoint diop)
+{
+       boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (_route);
+       if (t) {
+               t->set_disk_io_point (diop);
+       }
+}
 
 void
 ProcessorBox::clear_processors ()
@@ -3506,7 +3393,7 @@ ProcessorBox::clear_processors ()
        choices.push_back (_("Cancel"));
        choices.push_back (_("Yes, remove them all"));
 
-       Gtkmm2ext::Choice prompter (_("Remove processors"), prompt, choices);
+       ArdourWidgets::Choice prompter (_("Remove processors"), prompt, choices);
 
        if (prompter.run () == 1) {
                _route->clear_processors (PreFader);
@@ -3531,7 +3418,7 @@ ProcessorBox::clear_processors (Placement p)
        choices.push_back (_("Cancel"));
        choices.push_back (_("Yes, remove them all"));
 
-       Gtkmm2ext::Choice prompter (_("Remove processors"), prompt, choices);
+       ArdourWidgets::Choice prompter (_("Remove processors"), prompt, choices);
 
        if (prompter.run () == 1) {
                _route->clear_processors (p);
@@ -3773,6 +3660,12 @@ ProcessorBox::register_actions ()
                processor_box_actions, X_("manage-pins"), _("Pin Connections..."),
                sigc::ptr_fun (ProcessorBox::rb_manage_pins));
 
+       /* Disk IO stuff */
+       disk_io_action = myactions.register_action (processor_box_actions, X_("disk-io-menu"), _("Disk I/O ..."));
+       myactions.register_action (processor_box_actions, X_("disk-io-prefader"), _("Pre-Fader."), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_set_disk_io_position), DiskIOPreFader));
+       myactions.register_action (processor_box_actions, X_("disk-io-postfader"), _("Post-Fader."), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_set_disk_io_position), DiskIOPostFader));
+       myactions.register_action (processor_box_actions, X_("disk-io-custom"), _("Custom."), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_set_disk_io_position), DiskIOCustom));
+
        /* show editors */
        edit_action = myactions.register_action (
                processor_box_actions, X_("edit"), _("Edit..."),
@@ -3805,6 +3698,16 @@ ProcessorBox::rb_ab_plugins ()
        _current_processor_box->ab_plugins ();
 }
 
+void
+ProcessorBox::rb_set_disk_io_position (DiskIOPoint diop)
+{
+       if (_current_processor_box == 0) {
+               return;
+       }
+
+       _current_processor_box->set_disk_io_position (diop);
+}
+
 void
 ProcessorBox::rb_manage_pins ()
 {
@@ -4138,7 +4041,6 @@ void
 ProcessorBox::set_processor_ui (boost::shared_ptr<Processor> p, Gtk::Window* w)
 {
        assert (p->window_proxy());
-       p->set_ui (w);
        p->window_proxy()->use_window (*w);
 }
 
@@ -4220,14 +4122,18 @@ ProcessorWindowProxy::ProcessorWindowProxy (string const & name, ProcessorBox* b
        : WM::ProxyBase (name, string())
        , _processor_box (box)
        , _processor (processor)
-       , is_custom (false)
-       , want_custom (false)
+       , is_custom (true)
+       , want_custom (true)
 {
        boost::shared_ptr<Processor> p = _processor.lock ();
        if (!p) {
                return;
        }
        p->DropReferences.connect (going_away_connection, MISSING_INVALIDATOR, boost::bind (&ProcessorWindowProxy::processor_going_away, this), gui_context());
+
+       p->ToggleUI.connect (gui_connections, invalidator (*this), boost::bind (&ProcessorWindowProxy::show_the_right_window, this, false), gui_context());
+       p->ShowUI.connect (gui_connections, invalidator (*this), boost::bind (&ProcessorWindowProxy::show_the_right_window, this, true), gui_context());
+       p->HideUI.connect (gui_connections, invalidator (*this), boost::bind (&ProcessorWindowProxy::hide, this), gui_context());
 }
 
 ProcessorWindowProxy::~ProcessorWindowProxy()
@@ -4242,6 +4148,7 @@ ProcessorWindowProxy::~ProcessorWindowProxy()
 void
 ProcessorWindowProxy::processor_going_away ()
 {
+       gui_connections.drop_connections ();
        delete _window;
        _window = 0;
        WM::Manager::instance().remove (this);
@@ -4312,20 +4219,23 @@ ProcessorWindowProxy::get (bool create)
 
                if (_window) {
                        setup ();
+                       _window->show_all ();
                }
-               _window->show_all ();
        }
        return _window;
 }
 
 void
-ProcessorWindowProxy::show_the_right_window ()
+ProcessorWindowProxy::show_the_right_window (bool show_not_toggle)
 {
        if (_window && (is_custom != want_custom)) {
                /* drop existing window - wrong type */
                set_state_mask (Gtkmm2ext::WindowProxy::StateMask (state_mask () & ~WindowProxy::Size));
                drop_window ();
        }
+       if (_window && fully_visible () && show_not_toggle) {
+               return;
+       }
        toggle ();
 }