fix leak of Panner,Pannable and MonoPanner (UI)
[ardour.git] / gtk2_ardour / processor_box.cc
index 7dc2f4f25f4013b29b07113f64f568b0ea6eb5a2..ce33f61de7dde512ab721ec687da639e8ad67595 100644 (file)
@@ -76,7 +76,7 @@
 
 #include "i18n.h"
 
-#ifdef HAVE_AUDIOUNITS
+#ifdef AUDIOUNIT_SUPPORT
 class AUPluginUI;
 #endif
 
@@ -92,58 +92,45 @@ RefPtr<Action> ProcessorBox::paste_action;
 RefPtr<Action> ProcessorBox::cut_action;
 RefPtr<Action> ProcessorBox::rename_action;
 RefPtr<Action> ProcessorBox::edit_action;
+RefPtr<Action> ProcessorBox::controls_action;
 Glib::RefPtr<Gdk::Pixbuf> SendProcessorEntry::_slider;
 
 ProcessorEntry::ProcessorEntry (boost::shared_ptr<Processor> p, Width w)
-       : _position (PreFader)
+       : _button (ArdourButton::led_default_elements)
+       , _position (PreFader)
        , _processor (p)
        , _width (w)
        , _visual_state (Gtk::STATE_NORMAL)
 {
-       _hbox.pack_start (_active, false, false);
-       _event_box.add (_name);
-       _hbox.pack_start (_event_box, true, true);
-       _vbox.pack_start (_hbox);
-       _frame.add (_vbox);
-
-       /* without this, the border is mis-drawn on some systems */
-       _vbox.set_border_width (1);
-
-       _name.set_alignment (0, 0.5);
-       _name.set_text (name ());
-       _name.set_padding (2, 2);
-
-       if (boost::dynamic_pointer_cast<Amp> (p)) {
-               /* Fader processor gets a special look */
-               _event_box.set_name ("ProcessorFader");
-               _frame.set_name ("ProcessorFaderFrame");
-               _name.set_padding (2, 4);
-       }
-
-       _active.set_active (_processor->active ());
-       _active.signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::active_toggled));
-
-       _frame.show ();
+       _vbox.pack_start (_button, true, true);
        _vbox.show ();
-       _hbox.show ();
-       _event_box.show ();
-       _name.show ();
-       _active.show ();
        
+       if (_processor->active()) {
+               _button.set_active_state (CairoWidget::Active);
+       }
+       _button.set_diameter (3);
+       _button.set_distinct_led_click (true);
+       _button.set_led_left (true);
+       _button.signal_led_clicked.connect (sigc::mem_fun (*this, &ProcessorEntry::led_clicked));
+       _button.set_text (name());
+       _button.show ();
+
        _processor->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_active_changed, this), gui_context());
        _processor->PropertyChanged.connect (name_connection, invalidator (*this), ui_bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context());
+
+       setup_visuals ();
 }
 
 EventBox&
 ProcessorEntry::action_widget ()
 {
-       return _event_box;
+       return _button;
 }
 
 Gtk::Widget&
 ProcessorEntry::widget ()
 {
-       return _frame;
+       return _vbox;
 }
 
 string
@@ -153,17 +140,33 @@ ProcessorEntry::drag_text () const
 }
 
 void
-ProcessorEntry::set_visual_state (Gtk::StateType t)
+ProcessorEntry::set_position (Position p)
 {
-       _visual_state = t;
+       _position = p;
        setup_visuals ();
 }
 
 void
-ProcessorEntry::set_position (Position p)
+ProcessorEntry::set_visual_state (Gtk::StateType t)
 {
-       _position = p;
-       setup_visuals ();
+       /* map from GTK state to CairoWidget */
+
+       switch (t) {
+       case Gtk::STATE_ACTIVE:
+               _button.set_active_state (CairoWidget::Active);
+               _button.unset_visual_state ();
+               break;
+
+       case Gtk::STATE_SELECTED:
+               _button.set_visual_state (CairoWidget::Selected);
+               break;
+
+       case Gtk::STATE_NORMAL:
+       default:
+               _button.unset_visual_state ();
+               _button.unset_active_state ();
+               break;
+       }
 }
 
 void
@@ -171,46 +174,19 @@ ProcessorEntry::setup_visuals ()
 {
        switch (_position) {
        case PreFader:
-               _event_box.set_name ("ProcessorPreFader");
-               if (_visual_state == Gtk::STATE_NORMAL) {
-                       _frame.set_name ("ProcessorPreFaderFrame");
-               }
+               _button.set_name ("processor prefader");
                break;
 
        case Fader:
-               _event_box.set_name ("ProcessorFader");
-               if (_visual_state == Gtk::STATE_NORMAL) {
-                       _frame.set_name ("ProcessorFaderFrame");
-               }
+               _button.set_name ("processor fader");
                break;
 
        case PostFader:
-               _event_box.set_name ("ProcessorPostFader");
-               if (_visual_state == Gtk::STATE_NORMAL) {
-                       _frame.set_name ("ProcessorPostFaderFrame");
-               }
-               break;
-       }
-
-       switch (_visual_state) {
-       case Gtk::STATE_NORMAL:
-               /* _frame has been set up above */
-               _event_box.set_state (Gtk::STATE_NORMAL);
-               break;
-       case Gtk::STATE_SELECTED:
-               _frame.set_name ("ProcessorFrameSelected");
-               /* don't change the background of the box when it is selected */
-               _event_box.set_state (Gtk::STATE_NORMAL);
-               break;
-       case Gtk::STATE_ACTIVE:
-               _frame.set_name ("ProcessorFrameActiveSend");
-               _event_box.set_state (Gtk::STATE_ACTIVE);
-               break;
-       default:
+               _button.set_name ("processor postfader");
                break;
        }
 }
-       
+
 
 boost::shared_ptr<Processor>
 ProcessorEntry::processor () const
@@ -225,24 +201,22 @@ ProcessorEntry::set_enum_width (Width w)
 }
 
 void
-ProcessorEntry::active_toggled ()
+ProcessorEntry::led_clicked()
 {
-       if (_active.get_active ()) {
-               if (!_processor->active ()) {
-                       _processor->activate ();
-               }
+       if (!_processor->active ()) {
+               _processor->activate ();
        } else {
-               if (_processor->active ()) {
-                       _processor->deactivate ();
-               }
+               _processor->deactivate ();
        }
 }
 
 void
 ProcessorEntry::processor_active_changed ()
 {
-       if (_active.get_active () != _processor->active ()) {
-               _active.set_active (_processor->active ());
+       if (_processor->active()) {
+               _button.set_active_state (CairoWidget::Active);
+       } else {
+               _button.unset_active_state ();
        }
 }
 
@@ -250,7 +224,7 @@ void
 ProcessorEntry::processor_property_changed (const PropertyChange& what_changed)
 {
        if (what_changed.contains (ARDOUR::Properties::name)) {
-               _name.set_text (name ());
+               _button.set_text (name ());
        }
 }
 
@@ -259,18 +233,18 @@ ProcessorEntry::name () const
 {
        boost::shared_ptr<Send> send;
        string name_display;
-       
+
        if ((send = boost::dynamic_pointer_cast<Send> (_processor)) != 0 &&
            !boost::dynamic_pointer_cast<InternalSend>(_processor)) {
-               
+
                name_display += '>';
-               
+
                /* grab the send name out of its overall name */
-               
+
                string::size_type lbracket, rbracket;
                lbracket = send->name().find ('[');
                rbracket = send->name().find (']');
-               
+
                switch (_width) {
                case Wide:
                        name_display += send->name().substr (lbracket+1, lbracket-rbracket-1);
@@ -279,9 +253,9 @@ ProcessorEntry::name () const
                        name_display += PBD::short_version (send->name().substr (lbracket+1, lbracket-rbracket-1), 4);
                        break;
                }
-               
+
        } else {
-               
+
                switch (_width) {
                case Wide:
                        name_display += _processor->display_name();
@@ -290,19 +264,19 @@ ProcessorEntry::name () const
                        name_display += PBD::short_version (_processor->display_name(), 5);
                        break;
                }
-               
+
        }
-       
+
        return name_display;
 }
 
 SendProcessorEntry::SendProcessorEntry (boost::shared_ptr<Send> s, Width w)
-       : ProcessorEntry (s, w),
-         _send (s),
-         /* set the adjustment to a gain of 0dB so that the fader's default value is right */
-         _adjustment (0.781787, 0, 1, 0.01, 0.1),
-         _fader (_slider, &_adjustment, 0, false),
-         _ignore_gain_change (false)
+       : ProcessorEntry (s, w)
+       , _send (s)
+       , _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1)
+       , _fader (_slider, &_adjustment, 0, false)
+       , _ignore_gain_change (false)
+       , _data_type (DataType::AUDIO)
 {
        _fader.set_name ("SendFader");
        _fader.set_controllable (_send->amp()->gain_control ());
@@ -311,10 +285,39 @@ SendProcessorEntry::SendProcessorEntry (boost::shared_ptr<Send> s, Width w)
        _fader.show ();
 
        _adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &SendProcessorEntry::gain_adjusted));
-       _send->amp()->gain_control()->Changed.connect (send_gain_connection, invalidator (*this), boost::bind (&SendProcessorEntry::show_gain, this), gui_context());
+
+       _send->amp()->gain_control()->Changed.connect (
+               _send_connections, invalidator (*this), boost::bind (&SendProcessorEntry::show_gain, this), gui_context()
+               );
+       
+       _send->amp()->ConfigurationChanged.connect (
+               _send_connections, invalidator (*this), ui_bind (&SendProcessorEntry::setup_gain_adjustment, this), gui_context ()
+               );
+
+       setup_gain_adjustment ();
        show_gain ();
 }
 
+void
+SendProcessorEntry::setup_gain_adjustment ()
+{
+       if (_send->amp()->output_streams().n_midi() == 0) {
+               _data_type = DataType::AUDIO;
+               _adjustment.set_lower (0);
+               _adjustment.set_upper (1);
+               _adjustment.set_step_increment (0.01);
+               _adjustment.set_page_increment (0.1);
+               _fader.set_default_value (gain_to_slider_position (1));
+       } else {
+               _data_type = DataType::MIDI;
+               _adjustment.set_lower (0);
+               _adjustment.set_upper (2);
+               _adjustment.set_step_increment (0.05);
+               _adjustment.set_page_increment (0.1);
+               _fader.set_default_value (1);
+       }
+}
+
 void
 SendProcessorEntry::setup_slider_pix ()
 {
@@ -325,9 +328,16 @@ SendProcessorEntry::setup_slider_pix ()
 void
 SendProcessorEntry::show_gain ()
 {
-       ENSURE_GUI_THREAD (*this, &SendProcessorEntry::show_gain)
+       gain_t value = 0;
        
-       float const value = gain_to_slider_position (_send->amp()->gain ());
+       switch (_data_type) {
+       case DataType::AUDIO:
+               value = gain_to_slider_position_with_max (_send->amp()->gain (), Config->get_max_gain());
+               break;
+       case DataType::MIDI:
+               value = _send->amp()->gain ();
+               break;
+       }
 
        if (_adjustment.get_value() != value) {
                _ignore_gain_change = true;
@@ -337,7 +347,11 @@ SendProcessorEntry::show_gain ()
                stringstream s;
                s.precision (1);
                s.setf (ios::fixed, ios::floatfield);
-               s << accurate_coefficient_to_dB (_send->amp()->gain ()) << _("dB");
+               s << accurate_coefficient_to_dB (_send->amp()->gain ());
+               if (_data_type == DataType::AUDIO) {
+                       s << _("dB");
+               }
+               
                _fader.set_tooltip_text (s.str ());
        }
 }
@@ -349,7 +363,17 @@ SendProcessorEntry::gain_adjusted ()
                return;
        }
 
-       _send->amp()->set_gain (slider_position_to_gain (_adjustment.get_value()), this);
+       gain_t value = 0;
+
+       switch (_data_type) {
+       case DataType::AUDIO:
+               value = slider_position_to_gain_with_max (_adjustment.get_value(), Config->get_max_gain());
+               break;
+       case DataType::MIDI:
+               value = _adjustment.get_value ();
+       }
+       
+       _send->amp()->set_gain (value, this);
 }
 
 void
@@ -384,6 +408,12 @@ PluginInsertProcessorEntry::plugin_insert_splitting_changed ()
        }
 }
 
+void
+PluginInsertProcessorEntry::hide_things ()
+{
+       plugin_insert_splitting_changed ();
+}
+
 void
 PluginInsertProcessorEntry::setup_visuals ()
 {
@@ -416,7 +446,7 @@ PluginInsertProcessorEntry::SplittingIcon::on_expose_event (GdkEventExpose* ev)
 
        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);
 
@@ -440,7 +470,7 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelecto
        , _owner_is_mixer (owner_is_mixer)
        , ab_direction (true)
        , _get_plugin_selector (get_plugin_selector)
-       , _placement(PreFader)
+       , _placement (-1)
        , _rr_selection(rsel)
 {
        set_session (sess);
@@ -493,7 +523,7 @@ ProcessorBox::set_route (boost::shared_ptr<Route> r)
        if (_route == r) {
                return;
        }
-       
+
        _route_connections.drop_connections();
 
        /* new route: any existing block on processor redisplay must be meaningless */
@@ -503,11 +533,11 @@ ProcessorBox::set_route (boost::shared_ptr<Route> r)
        _route->processors_changed.connect (
                _route_connections, invalidator (*this), ui_bind (&ProcessorBox::route_processors_changed, this, _1), gui_context()
                );
-       
+
        _route->DropReferences.connect (
                _route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_going_away, this), gui_context()
                );
-       
+
        _route->PropertyChanged.connect (
                _route_connections, invalidator (*this), ui_bind (&ProcessorBox::route_property_changed, this, _1), gui_context()
                );
@@ -520,6 +550,7 @@ ProcessorBox::route_going_away ()
 {
        /* don't keep updating display as processors are deleted */
        no_processor_redisplay = true;
+       _route.reset ();
 }
 
 void
@@ -569,7 +600,7 @@ ProcessorBox::set_width (Width w)
        if (_width == w) {
                return;
        }
-       
+
        _width = w;
 
        list<ProcessorEntry*> children = processor_display.children ();
@@ -626,19 +657,20 @@ ProcessorBox::new_send ()
 }
 
 void
-ProcessorBox::show_processor_menu (gint arg)
+ProcessorBox::show_processor_menu (int arg)
 {
        if (processor_menu == 0) {
                processor_menu = build_processor_menu ();
+               processor_menu->signal_unmap().connect (sigc::mem_fun (*this, &ProcessorBox::processor_menu_unmapped));
        }
 
-       Gtk::MenuItem* plugin_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/processormenu/newplugin"));
+       Gtk::MenuItem* plugin_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/newplugin"));
 
        if (plugin_menu_item) {
                plugin_menu_item->set_submenu (*_get_plugin_selector()->plugin_menu());
        }
 
-       Gtk::MenuItem* aux_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/processormenu/newaux"));
+       Gtk::MenuItem* aux_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/newaux"));
 
        if (aux_menu_item) {
                Menu* m = build_possible_aux_menu();
@@ -656,6 +688,13 @@ ProcessorBox::show_processor_menu (gint arg)
        paste_action->set_sensitive (!_rr_selection.processors.empty());
 
        processor_menu->popup (1, arg);
+
+       /* Add a placeholder gap to the processor list to indicate where a processor would be
+          inserted were one chosen from the menu.
+       */
+       int x, y;
+       processor_display.get_pointer (x, y);
+       _placement = processor_display.add_placeholder (y);
 }
 
 bool
@@ -714,7 +753,7 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                        processor_display.select_all ();
                        ret = true;
-               } 
+               }
                break;
 
        case GDK_c:
@@ -784,7 +823,7 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry*
        if (child) {
                processor = child->processor ();
        }
-       
+
        int ret = false;
        bool selected = processor_display.selected (child);
 
@@ -817,34 +856,16 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
        if (child) {
                processor = child->processor ();
        }
-       
-       int ret = false;
 
        if (processor && Keyboard::is_delete_event (ev)) {
 
                Glib::signal_idle().connect (sigc::bind (
                                sigc::mem_fun(*this, &ProcessorBox::idle_delete_processor),
                                boost::weak_ptr<Processor>(processor)));
-               ret = true;
 
        } else if (Keyboard::is_context_menu_event (ev)) {
 
-               /* figure out if we are above or below the fader/amp processor,
-                  and set the next insert position appropriately.
-               */
-
-               if (processor) {
-                       if (_route->processor_is_prefader (processor)) {
-                               _placement = PreFader;
-                       } else {
-                               _placement = PostFader;
-                       }
-               } else {
-                       _placement = PostFader;
-               }
-
                show_processor_menu (ev->time);
-               ret = true;
 
        } else if (processor && Keyboard::is_button2_event (ev)
 #ifndef GTKOSX
@@ -859,8 +880,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
                } else {
                        processor->activate ();
                }
-               ret = true;
-
        }
 
        return false;
@@ -869,7 +888,7 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
 Menu *
 ProcessorBox::build_processor_menu ()
 {
-       processor_menu = dynamic_cast<Gtk::Menu*>(ActionManager::get_widget("/processormenu") );
+       processor_menu = dynamic_cast<Gtk::Menu*>(ActionManager::get_widget("/ProcessorMenu") );
        processor_menu->set_name ("ArdourContextMenu");
        return processor_menu;
 }
@@ -877,14 +896,24 @@ ProcessorBox::build_processor_menu ()
 void
 ProcessorBox::selection_changed ()
 {
-       bool const sensitive = (processor_display.selection().empty()) ? false : true;
-       ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive);
-       edit_action->set_sensitive (one_processor_can_be_edited ());
+       const bool sensitive = !processor_display.selection().empty();
+       ActionManager::set_sensitive(ActionManager::plugin_selection_sensitive_actions,
+                                    sensitive);
+       edit_action->set_sensitive(one_processor_can_be_edited());
+
+       const bool single_selection = (processor_display.selection().size() == 1);
+
+       boost::shared_ptr<PluginInsert> pi;
+       if (single_selection) {
+               pi = boost::dynamic_pointer_cast<PluginInsert>(
+                       processor_display.selection().front()->processor());
+       }
+
+       /* enable gui for plugin inserts with editors */
+       controls_action->set_sensitive(pi && pi->plugin()->has_editor());
 
        /* disallow rename for multiple selections and for plugin inserts */
-       rename_action->set_sensitive (
-               processor_display.selection().size() == 1 && boost::dynamic_pointer_cast<PluginInsert> (processor_display.selection().front()->processor()) == 0
-               );
+       rename_action->set_sensitive(single_selection && pi);
 }
 
 void
@@ -915,11 +944,7 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins)
 
                Route::ProcessorStreams err_streams;
 
-               if (Config->get_new_plugins_active()) {
-                       processor->activate ();
-               }
-
-               if (_route->add_processor (processor, _placement, &err_streams)) {
+               if (_route->add_processor_by_index (processor, _placement, &err_streams, Config->get_new_plugins_active ())) {
                        weird_plugin_dialog (**p, err_streams);
                        return true;
                        // XXX SHAREDPTR delete plugin here .. do we even need to care?
@@ -940,7 +965,7 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
        ArdourDialog dialog (_("Plugin Incompatibility"));
        Label label;
 
-       string text = string_compose(_("You attempted to add the plugin \"%1\" at index %2.\n"),
+       string text = string_compose(_("You attempted to add the plugin \"%1\" in slot %2.\n"),
                        p.name(), streams.index);
 
        bool has_midi  = streams.count.n_midi() > 0 || p.get_info()->n_inputs.n_midi() > 0;
@@ -949,14 +974,14 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
        text += _("\nThis plugin has:\n");
        if (has_midi) {
                uint32_t const n = p.get_info()->n_inputs.n_midi ();
-               text += string_compose (ngettext ("\t%1 MIDI input", "\t%1 MIDI inputs", n), n);
+               text += string_compose (ngettext ("\t%1 MIDI input\n", "\t%1 MIDI inputs\n", n), n);
        }
        if (has_audio) {
                uint32_t const n = p.get_info()->n_inputs.n_audio ();
-               text += string_compose (ngettext ("\t%1 audio input", "\t%1 audio inputs", n), n);
+               text += string_compose (ngettext ("\t%1 audio input\n", "\t%1 audio inputs\n", n), n);
        }
 
-       text += _("\nBut at the insertion point, there are:\n");
+       text += _("\nbut at the insertion point, there are:\n");
        if (has_midi) {
                uint32_t const n = streams.count.n_midi ();
                text += string_compose (ngettext ("\t%1 MIDI channel\n", "\t%1 MIDI channels\n", n), n);
@@ -984,7 +1009,7 @@ void
 ProcessorBox::choose_insert ()
 {
        boost::shared_ptr<Processor> processor (new PortInsert (*_session, _route->pannable(), _route->mute_master()));
-       _route->add_processor (processor, _placement);
+       _route->add_processor_by_index (processor, _placement);
 }
 
 /* Caller must not hold process lock */
@@ -1046,7 +1071,7 @@ ProcessorBox::send_io_finished (IOSelector::Result r, boost::weak_ptr<Processor>
                break;
 
        case IOSelector::Accepted:
-               _route->add_processor (processor, _placement);
+               _route->add_processor_by_index (processor, _placement);
                if (Profile->get_sae()) {
                        processor->activate ();
                }
@@ -1074,7 +1099,7 @@ ProcessorBox::return_io_finished (IOSelector::Result r, boost::weak_ptr<Processo
                break;
 
        case IOSelector::Accepted:
-               _route->add_processor (processor, _placement);
+               _route->add_processor_by_index (processor, _placement);
                if (Profile->get_sae()) {
                        processor->activate ();
                }
@@ -1130,7 +1155,7 @@ ProcessorBox::redisplay_processors ()
        for (list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin(); i != _processor_window_proxies.end(); ++i) {
                (*i)->marked = false;
        }
-               
+
        _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::maybe_add_processor_to_ui_list));
 
        /* trim dead wood from the processor window proxy list */
@@ -1167,7 +1192,7 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr<Processor> w)
        while (i != _processor_window_proxies.end()) {
 
                boost::shared_ptr<Processor> t = (*i)->processor().lock ();
-               
+
                if (p == t) {
                        /* this processor is already on the list; done */
                        (*i)->marked = true;
@@ -1189,19 +1214,19 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr<Processor> w)
        } else {
                loc = X_("P");
        }
-       
+
        ProcessorWindowProxy* wp = new ProcessorWindowProxy (
                string_compose ("%1-%2-%3", loc, _route->id(), p->id()),
                _session->extra_xml (X_("UI")),
                this,
                w);
-       
+
        wp->marked = true;
 
-        /* if the processor already has an existing UI, 
+        /* if the processor already has an existing UI,
            note that so that we don't recreate it
         */
-        
+
         void* existing_ui = p->get_ui ();
 
         if (existing_ui) {
@@ -1231,7 +1256,7 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
        } else {
                e = new ProcessorEntry (processor, _width);
        }
-       
+
        e->set_pixel_width (get_allocation().get_width());
        processor_display.add_child (e);
 }
@@ -1247,7 +1272,7 @@ ProcessorBox::build_processor_tooltip (EventBox& box, string start)
                tip += '\n';
                tip += (*i)->processor()->name();
        }
-       
+
        ARDOUR_UI::instance()->set_tip (box, tip);
 }
 
@@ -1263,7 +1288,7 @@ ProcessorBox::setup_entry_positions ()
 {
        list<ProcessorEntry*> children = processor_display.children ();
        bool pre_fader = true;
-       
+
        for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
                if (boost::dynamic_pointer_cast<Amp>((*i)->processor())) {
                        pre_fader = false;
@@ -1302,14 +1327,14 @@ void
 ProcessorBox::report_failed_reorder ()
 {
        /* reorder failed, so redisplay */
-       
+
        redisplay_processors ();
-       
+
        /* now tell them about the problem */
-       
+
        ArdourDialog dialog (_("Plugin Incompatibility"));
        Label label;
-       
+
        label.set_text (_("\
 You cannot reorder these plugins/sends/inserts\n\
 in that way because the inputs and\n\
@@ -1318,12 +1343,12 @@ outputs will not work correctly."));
        dialog.get_vbox()->set_border_width (12);
        dialog.get_vbox()->pack_start (label);
        dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
-       
+
        dialog.set_name (X_("PluginIODialog"));
        dialog.set_position (Gtk::WIN_POS_MOUSE);
        dialog.set_modal (true);
        dialog.show_all ();
-       
+
        dialog.run ();
 }
 
@@ -1349,18 +1374,18 @@ ProcessorBox::can_cut () const
         vector<boost::shared_ptr<Processor> > sel;
 
         get_selected_processors (sel);
-        
+
         /* cut_processors () does not cut inserts */
 
         for (vector<boost::shared_ptr<Processor> >::const_iterator i = sel.begin (); i != sel.end (); ++i) {
-                
+
                if (boost::dynamic_pointer_cast<PluginInsert>((*i)) != 0 ||
                    (boost::dynamic_pointer_cast<Send>((*i)) != 0) ||
                    (boost::dynamic_pointer_cast<Return>((*i)) != 0)) {
                         return true;
                 }
         }
-        
+
         return false;
 }
 
@@ -1615,7 +1640,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
                                 }
 
                                p.reset (s);
-                                        
+
 
                        } else if (type->value() == "return") {
 
@@ -1630,6 +1655,14 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
 
                                p.reset (r);
 
+                       } else if (type->value() == "port") {
+
+                               XMLNode n (**niter);
+                               p.reset (new PortInsert (*_session, _route->pannable (), _route->mute_master ()));
+                               if (p->set_state (n, Stateful::loading_state_version)) {
+                                       return;
+                               }
+
                        } else {
                                /* XXX its a bit limiting to assume that everything else
                                   is a plugin.
@@ -1695,7 +1728,8 @@ ProcessorBox::for_selected_processors (void (ProcessorBox::*method)(boost::share
 void
 ProcessorBox::all_processors_active (bool state)
 {
-       _route->all_processors_active (_placement, state);
+       _route->all_processors_active (PreFader, state);
+       _route->all_processors_active (PostFader, state);
 }
 
 void
@@ -1801,8 +1835,10 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
 
        if (boost::dynamic_pointer_cast<Amp> (processor)) {
 
-               _parent_strip->revert_to_default_display ();
-               
+               if (_parent_strip) {
+                       _parent_strip->revert_to_default_display ();
+               }
+
        } else if ((internal_send = boost::dynamic_pointer_cast<InternalSend> (processor)) != 0) {
 
                if (!_session->engine().connected()) {
@@ -1828,10 +1864,10 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
 
        } else if ((retrn = boost::dynamic_pointer_cast<Return> (processor)) != 0) {
 
-                if (boost::dynamic_pointer_cast<InternalReturn> (retrn)) {
-                        /* no GUI for these */
-                        return;
-                }
+               if (boost::dynamic_pointer_cast<InternalReturn> (retrn)) {
+                       /* no GUI for these */
+                       return;
+               }
 
                if (!_session->engine().connected()) {
                        return;
@@ -1911,10 +1947,32 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
        }
 }
 
+void
+ProcessorBox::toggle_processor_controls (boost::shared_ptr<Processor> processor)
+{
+       boost::shared_ptr<PluginInsert> plugin_insert
+               = boost::dynamic_pointer_cast<PluginInsert>(processor);
+       if (!plugin_insert) {
+               return;
+       }
+
+       Container*      toplevel  = get_toplevel();
+       Window*         win       = dynamic_cast<Gtk::Window*>(toplevel);
+       PluginUIWindow* plugin_ui = new PluginUIWindow(win, plugin_insert, true, false);
+       plugin_ui->set_title(generate_processor_title (plugin_insert));
+
+       if (plugin_ui->is_visible()) {
+               plugin_ui->hide();
+       } else {
+               plugin_ui->show_all();
+               plugin_ui->present();
+       }
+}
+
 void
 ProcessorBox::register_actions ()
 {
-       Glib::RefPtr<Gtk::ActionGroup> popup_act_grp = Gtk::ActionGroup::create(X_("processormenu"));
+       Glib::RefPtr<Gtk::ActionGroup> popup_act_grp = Gtk::ActionGroup::create(X_("ProcessorMenu"));
        Glib::RefPtr<Action> act;
 
        /* new stuff */
@@ -1961,15 +2019,21 @@ ProcessorBox::register_actions ()
        /* activation etc. */
 
        ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate all"),
-                                       sigc::ptr_fun (ProcessorBox::rb_activate_all));
+                       sigc::ptr_fun (ProcessorBox::rb_activate_all));
        ActionManager::register_action (popup_act_grp, X_("deactivate_all"), _("Deactivate all"),
-                                       sigc::ptr_fun (ProcessorBox::rb_deactivate_all));
+                       sigc::ptr_fun (ProcessorBox::rb_deactivate_all));
        ActionManager::register_action (popup_act_grp, X_("ab_plugins"), _("A/B Plugins"),
-                                       sigc::ptr_fun (ProcessorBox::rb_ab_plugins));
+                       sigc::ptr_fun (ProcessorBox::rb_ab_plugins));
 
        /* show editors */
-       edit_action = ActionManager::register_action (popup_act_grp, X_("edit"), _("Edit..."),
-                                                     sigc::ptr_fun (ProcessorBox::rb_edit));
+       edit_action = ActionManager::register_action (
+               popup_act_grp, X_("edit"), _("Edit..."),
+               sigc::ptr_fun (ProcessorBox::rb_edit));
+
+       /* show plugin GUI */
+       controls_action = ActionManager::register_action (
+                       popup_act_grp, X_("controls"), _("Controls..."),
+                       sigc::ptr_fun (ProcessorBox::rb_controls));
 
        ActionManager::add_action_group (popup_act_grp);
 }
@@ -2150,6 +2214,16 @@ ProcessorBox::rb_edit ()
        _current_processor_box->for_selected_processors (&ProcessorBox::toggle_edit_processor);
 }
 
+void
+ProcessorBox::rb_controls ()
+{
+       if (_current_processor_box == 0) {
+               return;
+       }
+
+       _current_processor_box->for_selected_processors (&ProcessorBox::toggle_processor_controls);
+}
+
 void
 ProcessorBox::route_property_changed (const PropertyChange& what_changed)
 {
@@ -2245,9 +2319,9 @@ void
 ProcessorBox::set_processor_ui (boost::shared_ptr<Processor> p, Gtk::Window* w)
 {
        list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin ();
-        
-        p->set_ui (w);
-        
+
+       p->set_ui (w);
+
        while (i != _processor_window_proxies.end()) {
                boost::shared_ptr<Processor> t = (*i)->processor().lock ();
                if (t && t == p) {
@@ -2285,6 +2359,21 @@ ProcessorBox::mixer_strip_delivery_changed (boost::weak_ptr<Delivery> w)
        }
 }
 
+void
+ProcessorBox::hide_things ()
+{
+       list<ProcessorEntry*> c = processor_display.children ();
+       for (list<ProcessorEntry*>::iterator i = c.begin(); i != c.end(); ++i) {
+               (*i)->hide_things ();
+       }
+}
+
+void
+ProcessorBox::processor_menu_unmapped ()
+{
+       processor_display.remove_placeholder ();
+}
+
 ProcessorWindowProxy::ProcessorWindowProxy (
        string const & name,
        XMLNode const * node,