NO-OP whitespace & foratting of header files

[ardour.git] / gtk2_ardour / plugin_pin_dialog.cc

diff --git a/gtk2_ardour/plugin_pin_dialog.cc b/gtk2_ardour/plugin_pin_dialog.cc
index 24a4fec4f4cc071c6f93ccdc315bec2db064d3db..5b7ed436bdd841ff88f6287062f8817966a63605 100644 (file)
--- a/gtk2_ardour/plugin_pin_dialog.cc
+++ b/gtk2_ardour/plugin_pin_dialog.cc
@@ -27,6 +27,7 @@
 
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/rgb_macros.h"
+#include "gtkmm2ext/menu_elems.h"
 
 #include "ardour/amp.h"
 #include "ardour/audioengine.h"
@@ -36,6 +37,7 @@
 #include "ardour/profile.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
+#include "ardour/value_as_string.h"
 
 #include "plugin_pin_dialog.h"
 #include "gui_thread.h"
@@ -1821,7 +1823,7 @@ PluginPinWidget::maybe_add_route_to_input_menu (boost::shared_ptr<Route> r, Data
        /* we're going to create the new send pre-fader, so check the route amp's data type.  */
        const ChanCount& rc (r->amp ()->input_streams ());
        if (!already_present && rc.get (dt) > 0) {
-               citems.push_back (MenuElem (r->name (), sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_send_from), wp, boost::weak_ptr<Route> (r))));
+               citems.push_back (MenuElemNoMnemonic (r->name (), sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_send_from), wp, boost::weak_ptr<Route> (r))));
                ++added;
        }
        return added;
@@ -1914,10 +1916,8 @@ PluginPinWidget::Control::set_tooltip ()
        if (!c) {
                return;
        }
-       char tmp[256];
-       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);
 }
 
@@ -1970,10 +1970,18 @@ PluginPinDialog::PluginPinDialog (boost::shared_ptr<ARDOUR::PluginInsert> pi)
 PluginPinDialog::PluginPinDialog (boost::shared_ptr<ARDOUR::Route> r)
        : ArdourWindow (string_compose (_("Pin Configuration: %1"), r->name ()))
        , _route (r)
+       , _height_mapped (false)
 {
        vbox = manage (new VBox ());
-       add (*vbox);
+       vbox->signal_size_allocate().connect (sigc::mem_fun (*this, &PluginPinDialog::map_height));
+       scroller = manage (new ScrolledWindow);
+       scroller->set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+       scroller->set_shadow_type (Gtk::SHADOW_NONE);
+       scroller->show ();
        vbox->show ();
+       scroller->add (*vbox);
+       add (*scroller);
+
 
        _route->foreach_processor (sigc::mem_fun (*this, &PluginPinDialog::add_processor));
 
@@ -1994,15 +2002,26 @@ PluginPinDialog::set_session (ARDOUR::Session *s)
        }
 }
 
+void
+PluginPinDialog::map_height (Gtk::Allocation&)
+{
+       if (!_height_mapped) {
+               scroller->set_size_request (-1, std::min (600, 2 + vbox->get_height()));
+               _height_mapped = true;
+       }
+}
+
 void
 PluginPinDialog::route_processors_changed (ARDOUR::RouteProcessorChange)
 {
        ppw.clear ();
-       remove ();
+       _height_mapped = false;
+       scroller->remove ();
        vbox = manage (new VBox ());
-       add (*vbox);
-       vbox->show ();
+       vbox->signal_size_allocate().connect (sigc::mem_fun (*this, &PluginPinDialog::map_height));
+       scroller->add (*vbox);
        _route->foreach_processor (sigc::mem_fun (*this, &PluginPinDialog::add_processor));
+       vbox->show ();
 }
 
 void
@@ -2021,6 +2040,11 @@ PluginPinDialog::add_processor (boost::weak_ptr<Processor> p)
                return;
        }
        boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (proc);
+#ifdef MIXBUS
+       if (pi && pi->is_channelstrip ()) {
+               pi.reset ();
+       }
+#endif
        if (pi) {
                ppw.push_back (PluginPinWidgetPtr(new PluginPinWidget (pi)));
                vbox->pack_start (*ppw.back());
@@ -2029,7 +2053,7 @@ PluginPinDialog::add_processor (boost::weak_ptr<Processor> p)
                hbox->pack_start (*manage (new HSeparator ()));
                hbox->pack_start (*manage (new Label (proc->display_name ())));
                hbox->pack_start (*manage (new HSeparator ()));
-               vbox->pack_start (*hbox);
+               vbox->pack_start (*hbox, false, false);
                hbox->show_all ();
        }
 }