X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplugin_pin_dialog.cc;h=5b7ed436bdd841ff88f6287062f8817966a63605;hb=b976bf8986290e8f4812a50e7fdd98b9cbeb4249;hp=da3c096d9279fe8f55ba60ed777bfad7cf9fae20;hpb=8fc19d6c670a106ffab2f12f1629d74c5855355b;p=ardour.git diff --git a/gtk2_ardour/plugin_pin_dialog.cc b/gtk2_ardour/plugin_pin_dialog.cc index da3c096d92..5b7ed436bd 100644 --- a/gtk2_ardour/plugin_pin_dialog.cc +++ b/gtk2_ardour/plugin_pin_dialog.cc @@ -21,13 +21,13 @@ #include #include -#include #include #include "pbd/replace_all.h" #include "gtkmm2ext/utils.h" #include "gtkmm2ext/rgb_macros.h" +#include "gtkmm2ext/menu_elems.h" #include "ardour/amp.h" #include "ardour/audioengine.h" @@ -37,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" @@ -44,7 +45,7 @@ #include "tooltips.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; @@ -52,12 +53,15 @@ using namespace std; using namespace Gtk; using namespace Gtkmm2ext; -PluginPinDialog::PluginPinDialog (boost::shared_ptr pi) - : ArdourWindow (string_compose (_("Pin Configuration: %1"), pi->name ())) - , _set_config (_("Manual Config"), ArdourButton::led_default_elements) - , _tgl_sidechain (_("Side Chain"), ArdourButton::led_default_elements) +PluginPinWidget::PluginPinWidget (boost::shared_ptr pi) + : _set_config (_("Manual Config"), ArdourButton::led_default_elements) + , _tgl_sidechain (_("Sidechain"), ArdourButton::led_default_elements) , _add_plugin (_("+")) , _del_plugin (_("-")) + , _add_input_audio (_("+")) + , _del_input_audio (_("-")) + , _add_input_midi (_("+")) + , _del_input_midi (_("-")) , _add_output_audio (_("+")) , _del_output_audio (_("-")) , _add_output_midi (_("+")) @@ -83,15 +87,15 @@ PluginPinDialog::PluginPinDialog (boost::shared_ptr pi) assert (pi->owner ()); // Route _pi->PluginIoReConfigure.connect ( - _plugin_connections, invalidator (*this), boost::bind (&PluginPinDialog::queue_idle_update, this), gui_context () + _plugin_connections, invalidator (*this), boost::bind (&PluginPinWidget::queue_idle_update, this), gui_context () ); _pi->PluginMapChanged.connect ( - _plugin_connections, invalidator (*this), boost::bind (&PluginPinDialog::queue_idle_update, this), gui_context () + _plugin_connections, invalidator (*this), boost::bind (&PluginPinWidget::queue_idle_update, this), gui_context () ); _pi->PluginConfigChanged.connect ( - _plugin_connections, invalidator (*this), boost::bind (&PluginPinDialog::queue_idle_update, this), gui_context () + _plugin_connections, invalidator (*this), boost::bind (&PluginPinWidget::queue_idle_update, this), gui_context () ); _pin_box_size = 2 * ceil (max (8., 10. * UIConfiguration::instance ().get_ui_scale ()) * .5); @@ -104,13 +108,20 @@ PluginPinDialog::PluginPinDialog (boost::shared_ptr pi) Menu_Helpers::MenuList& citems = reset_menu.items (); reset_menu.set_name ("ArdourContextMenu"); citems.clear (); - citems.push_back (Menu_Helpers::MenuElem (_("Reset"), sigc::mem_fun (*this, &PluginPinDialog::reset_mapping))); + citems.push_back (Menu_Helpers::MenuElem (_("Reset"), sigc::mem_fun (*this, &PluginPinWidget::reset_mapping))); _pm_size_group = SizeGroup::create (SIZE_GROUP_BOTH); _add_plugin.set_tweaks (ArdourButton::Square); _del_plugin.set_tweaks (ArdourButton::Square); - _pm_size_group->add_widget (_add_plugin); - _pm_size_group->add_widget (_del_plugin); + if (_pi->plugin (0)->get_info()->reconfigurable_io ()) { + _pm_size_group->add_widget (_add_input_audio); + _pm_size_group->add_widget (_del_input_audio); + _pm_size_group->add_widget (_add_input_midi); + _pm_size_group->add_widget (_del_input_midi); + } else { + _pm_size_group->add_widget (_add_plugin); + _pm_size_group->add_widget (_del_plugin); + } _pm_size_group->add_widget (_add_output_audio); _pm_size_group->add_widget (_del_output_audio); _pm_size_group->add_widget (_add_output_midi); @@ -130,14 +141,34 @@ PluginPinDialog::PluginPinDialog (boost::shared_ptr pi) /* left side */ tl->pack_start (_set_config, false, false); - box = manage (new HBox ()); - box->set_border_width (2); - box->pack_start (_add_plugin, true, false); - box->pack_start (_del_plugin, true, false); - f = manage (new Frame ()); - f->set_label (_("Instances")); - f->add (*box); - tl->pack_start (*f, false, false); + if (_pi->plugin (0)->get_info()->reconfigurable_io ()) { + box = manage (new HBox ()); + box->set_border_width (2); + box->pack_start (_add_input_audio, true, false); + box->pack_start (_del_input_audio, true, false); + f = manage (new Frame ()); + f->set_label (_("Audio Input Pins")); + f->add (*box); + tl->pack_start (*f, false, false); + + box = manage (new HBox ()); + box->set_border_width (2); + box->pack_start (_add_input_midi, true, false); + box->pack_start (_del_input_midi, true, false); + f = manage (new Frame ()); + f->set_label (_("MIDI Input Pins")); + f->add (*box); + tl->pack_start (*f, false, false); + } else { + box = manage (new HBox ()); + box->set_border_width (2); + box->pack_start (_add_plugin, true, false); + box->pack_start (_del_plugin, true, false); + f = manage (new Frame ()); + f->set_label (_("Instances")); + f->add (*box); + tl->pack_start (*f, false, false); + } box = manage (new HBox ()); box->set_border_width (2); @@ -188,54 +219,58 @@ PluginPinDialog::PluginPinDialog (boost::shared_ptr pi) hbox->pack_start (darea, true, true); hbox->pack_start (*tr, false, false); - VBox* vbox = manage (new VBox ()); - vbox->pack_start (*hbox, true, true); + pack_start (*hbox, true, true); set_border_width (4); - add (*vbox); - vbox->show_all (); + show_all (); plugin_reconfigured (); darea.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK); - darea.signal_size_request ().connect (sigc::mem_fun (*this, &PluginPinDialog::darea_size_request)); - darea.signal_size_allocate ().connect (sigc::mem_fun (*this, &PluginPinDialog::darea_size_allocate)); - darea.signal_expose_event ().connect (sigc::mem_fun (*this, &PluginPinDialog::darea_expose_event)); - darea.signal_button_press_event ().connect (sigc::mem_fun (*this, &PluginPinDialog::darea_button_press_event)); - darea.signal_button_release_event ().connect (sigc::mem_fun (*this, &PluginPinDialog::darea_button_release_event)); - darea.signal_motion_notify_event ().connect (sigc::mem_fun (*this, &PluginPinDialog::darea_motion_notify_event)); - - _tgl_sidechain.signal_clicked.connect (sigc::mem_fun (*this, &PluginPinDialog::toggle_sidechain)); - - _set_config.signal_clicked.connect (sigc::mem_fun (*this, &PluginPinDialog::reset_configuration)); - _add_plugin.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinDialog::add_remove_plugin_clicked), true)); - _del_plugin.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinDialog::add_remove_plugin_clicked), false)); - - _add_output_audio.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinDialog::add_remove_port_clicked), true, DataType::AUDIO)); - _del_output_audio.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinDialog::add_remove_port_clicked), false, DataType::AUDIO)); - _add_output_midi.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinDialog::add_remove_port_clicked), true, DataType::MIDI)); - _del_output_midi.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinDialog::add_remove_port_clicked), false, DataType::MIDI)); - _add_sc_audio.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinDialog::add_sidechain_port), DataType::AUDIO)); - _add_sc_midi.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinDialog::add_sidechain_port), DataType::MIDI)); + darea.signal_size_request ().connect (sigc::mem_fun (*this, &PluginPinWidget::darea_size_request)); + darea.signal_size_allocate ().connect (sigc::mem_fun (*this, &PluginPinWidget::darea_size_allocate)); + darea.signal_expose_event ().connect (sigc::mem_fun (*this, &PluginPinWidget::darea_expose_event)); + darea.signal_button_press_event ().connect (sigc::mem_fun (*this, &PluginPinWidget::darea_button_press_event)); + darea.signal_button_release_event ().connect (sigc::mem_fun (*this, &PluginPinWidget::darea_button_release_event)); + darea.signal_motion_notify_event ().connect (sigc::mem_fun (*this, &PluginPinWidget::darea_motion_notify_event)); + + _tgl_sidechain.signal_clicked.connect (sigc::mem_fun (*this, &PluginPinWidget::toggle_sidechain)); + + _set_config.signal_clicked.connect (sigc::mem_fun (*this, &PluginPinWidget::reset_configuration)); + _add_plugin.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_remove_plugin_clicked), true)); + _del_plugin.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_remove_plugin_clicked), false)); + + _add_input_audio.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_remove_inpin_clicked), true, DataType::AUDIO)); + _del_input_audio.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_remove_inpin_clicked), false, DataType::AUDIO)); + _add_input_midi.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_remove_inpin_clicked), true, DataType::MIDI)); + _del_input_midi.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_remove_inpin_clicked), false, DataType::MIDI)); + + _add_output_audio.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_remove_port_clicked), true, DataType::AUDIO)); + _del_output_audio.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_remove_port_clicked), false, DataType::AUDIO)); + _add_output_midi.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_remove_port_clicked), true, DataType::MIDI)); + _del_output_midi.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_remove_port_clicked), false, DataType::MIDI)); + + _add_sc_audio.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_sidechain_port), DataType::AUDIO)); + _add_sc_midi.signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_sidechain_port), DataType::MIDI)); AudioEngine::instance ()->PortConnectedOrDisconnected.connect ( - _io_connection, invalidator (*this), boost::bind (&PluginPinDialog::port_connected_or_disconnected, this, _1, _3), gui_context () + _io_connection, invalidator (*this), boost::bind (&PluginPinWidget::port_connected_or_disconnected, this, _1, _3), gui_context () ); } -PluginPinDialog::~PluginPinDialog () +PluginPinWidget::~PluginPinWidget () { delete _sidechain_selector; } void -PluginPinDialog::set_session (ARDOUR::Session *s) +PluginPinWidget::set_session (ARDOUR::Session *s) { SessionHandlePtr::set_session (s); plugin_reconfigured (); } void -PluginPinDialog::queue_idle_update () +PluginPinWidget::queue_idle_update () { /* various actions here are directly executed, in the GUI thread, * with the GUI-thread eventually taking the process and processor lock. @@ -255,11 +290,11 @@ PluginPinDialog::queue_idle_update () delete *i; } _controls.clear (); - Glib::signal_idle().connect (sigc::mem_fun(*this, &PluginPinDialog::idle_update)); + Glib::signal_idle().connect (sigc::mem_fun(*this, &PluginPinWidget::idle_update)); } bool -PluginPinDialog::idle_update () +PluginPinWidget::idle_update () { plugin_reconfigured (); return false; @@ -267,9 +302,9 @@ PluginPinDialog::idle_update () void -PluginPinDialog::plugin_reconfigured () +PluginPinWidget::plugin_reconfigured () { - ENSURE_GUI_THREAD (*this, &PluginPinDialog::plugin_reconfigured); + ENSURE_GUI_THREAD (*this, &PluginPinWidget::plugin_reconfigured); if (_ignore_updates) { return; } @@ -287,19 +322,27 @@ PluginPinDialog::plugin_reconfigured () if (_pi->custom_cfg ()) { _set_config.set_active (true); _add_plugin.set_sensitive (true); + _del_plugin.set_sensitive (_n_plugins > 1); _add_output_audio.set_sensitive (true); _add_output_midi.set_sensitive (true); - _del_plugin.set_sensitive (_n_plugins > 1); _del_output_audio.set_sensitive (_out.n_audio () > 0 && _out.n_total () > 1); _del_output_midi.set_sensitive (_out.n_midi () > 0 && _out.n_total () > 1); + _add_input_audio.set_sensitive (true); + _add_input_midi.set_sensitive (true); + _del_input_audio.set_sensitive (_sinks.n_audio () > 0 && _sinks.n_total () > 1); + _del_input_midi.set_sensitive (_sinks.n_midi () > 0 && _sinks.n_total () > 1); _out_presets.set_sensitive (false); _out_presets.set_text (_("Manual")); } else { _set_config.set_active (false); _add_plugin.set_sensitive (false); + _del_plugin.set_sensitive (false); + _add_input_audio.set_sensitive (false); + _add_input_midi.set_sensitive (false); + _del_input_audio.set_sensitive (false); + _del_input_midi.set_sensitive (false); _add_output_audio.set_sensitive (false); _add_output_midi.set_sensitive (false); - _del_plugin.set_sensitive (false); _del_output_audio.set_sensitive (false); _del_output_midi.set_sensitive (false); _out_presets.set_sensitive (true); @@ -343,6 +386,9 @@ PluginPinDialog::plugin_reconfigured () _elements.push_back (CtrlWidget ("", Output, (i < _out.n_midi () ? DataType::MIDI : DataType::AUDIO), id)); } + _in_map.clear (); + _out_map.clear (); + for (uint32_t n = 0; n < _n_plugins; ++n) { boost::shared_ptr plugin = _pi->plugin (n); for (uint32_t i = 0; i < _sinks.n_total (); ++i) { @@ -358,7 +404,13 @@ PluginPinDialog::plugin_reconfigured () const Plugin::IOPortDescription& iod (plugin->describe_io_port (dt, false, idx)); _elements.push_back (CtrlWidget (iod.name, Source, dt, idx, n)); } + _in_map[n] = _pi->input_map (n); + _out_map[n] = _pi->output_map (n); } + _has_midi_bypass = _pi->has_midi_bypass (); + _thru_map = _pi->thru_map (); + + /* cache maps */ /* calc minimum size */ const uint32_t max_ports = std::max (_ins.n_total (), _out.n_total ()); @@ -384,7 +436,7 @@ PluginPinDialog::plugin_reconfigured () } void -PluginPinDialog::refill_sidechain_table () +PluginPinWidget::refill_sidechain_table () { Table_Helpers::TableList& kids = _sidechain_tbl->children (); for (Table_Helpers::TableList::iterator i = kids.begin (); i != kids.end ();) { @@ -416,37 +468,12 @@ PluginPinDialog::refill_sidechain_table () } void -PluginPinDialog::refill_output_presets () +PluginPinWidget::refill_output_presets () { using namespace Menu_Helpers; _out_presets.clear_items (); - PluginOutputConfiguration ppc (_pi->plugin (0)->possible_output ()); - bool need_dropdown = true; - - if (ppc.size () == 0) { - need_dropdown = false; - } - - if (!_pi->strict_io () && ppc.size () == 1) { - need_dropdown = false; - } - - if (_pi->strict_io () && ppc.size () == 1) { - // "stereo" is currently preferred default for instruments, see PluginInsert - if (ppc.find (2) != ppc.end ()) { - need_dropdown = false; - } - } - - if (!_pi->needs_midi_input ()) { - /* loose definition of instruments, maybe impose additional - * || _pi->natural_input_streams ().n_audio () != 0 - * and special case variable output plugins - * && !_pi->plugin (0)->info->reconfigurable_io() - */ - need_dropdown = false; - } + bool need_dropdown = _pi->has_output_presets (); if (!need_dropdown) { _out_presets.set_sensitive (false); @@ -454,13 +481,14 @@ PluginPinDialog::refill_output_presets () return; } - _out_presets.AddMenuElem (MenuElem (_("Automatic"), sigc::bind (sigc::mem_fun (*this, &PluginPinDialog::select_output_preset), 0))); + _out_presets.AddMenuElem (MenuElem (_("Automatic"), sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::select_output_preset), 0))); const uint32_t n_audio = _pi->preset_out ().n_audio (); if (n_audio == 0) { _out_presets.set_text (_("Automatic")); } + PluginOutputConfiguration ppc (_pi->plugin (0)->possible_output ()); if (ppc.find (0) != ppc.end ()) { // anyting goes ppc.clear (); @@ -489,7 +517,7 @@ PluginPinDialog::refill_output_presets () tmp = string_compose (P_("%1 Channel", "%1 Channels", *i), *i); break; } - _out_presets.AddMenuElem (MenuElem (tmp, sigc::bind (sigc::mem_fun (*this, &PluginPinDialog::select_output_preset), *i))); + _out_presets.AddMenuElem (MenuElem (tmp, sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::select_output_preset), *i))); if (n_audio == *i) { _out_presets.set_text (tmp); } @@ -497,21 +525,27 @@ PluginPinDialog::refill_output_presets () } std::string -PluginPinDialog::port_label (const std::string& portname, bool strip) +PluginPinWidget::port_label (const std::string& portname, bool strip) { // compare to MixerStrip::update_io_button() string lpn (PROGRAM_NAME); boost::to_lower (lpn); std::string program_port_prefix = lpn + ":"; // e.g. "ardour:" + std::string pn = AudioEngine::instance ()->get_pretty_name_by_name (portname); + if (!pn.empty ()) { + string::size_type slash = pn.find ("/"); + if (slash != string::npos) { + pn = pn.substr (0, slash); + } + return pn; + } std::string label (portname); if (label.find ("system:capture_") == 0) { - label = AudioEngine::instance ()->get_pretty_name_by_name (label); if (label.empty ()) { label = portname.substr (15); } } else if (label.find ("system:midi_capture_") == 0) { - label = AudioEngine::instance ()->get_pretty_name_by_name (label); if (label.empty ()) { // "system:midi_capture_123" -> "123" label = "M " + portname.substr (20); @@ -529,7 +563,7 @@ PluginPinDialog::port_label (const std::string& portname, bool strip) } uint32_t -PluginPinDialog::add_port_to_table (boost::shared_ptr p, uint32_t r, bool can_remove) +PluginPinWidget::add_port_to_table (boost::shared_ptr p, uint32_t r, bool can_remove) { std::string lbl; std::string tip = p->name (); @@ -571,13 +605,13 @@ PluginPinDialog::add_port_to_table (boost::shared_ptr p, uint32_t r, bool ARDOUR_UI_UTILS::set_tooltip (*pb, tip); _sidechain_tbl->attach (*pb, 0, 1, r, r +1 , EXPAND|FILL, SHRINK); - pb->signal_button_press_event ().connect (sigc::bind (sigc::mem_fun (*this, &PluginPinDialog::sc_input_press), boost::weak_ptr (p)), false); - pb->signal_button_release_event ().connect (sigc::mem_fun (*this, &PluginPinDialog::sc_input_release), false); + pb->signal_button_press_event ().connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::sc_input_press), boost::weak_ptr (p)), false); + pb->signal_button_release_event ().connect (sigc::mem_fun (*this, &PluginPinWidget::sc_input_release), false); pb = manage (new ArdourButton ("-")); _sidechain_tbl->attach (*pb, 1, 2, r, r + 1, FILL, SHRINK); if (can_remove) { - pb->signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinDialog::remove_port), boost::weak_ptr (p))); + pb->signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::remove_port), boost::weak_ptr (p))); } else { pb->set_sensitive (false); } @@ -619,7 +653,7 @@ PluginPinDialog::add_port_to_table (boost::shared_ptr p, uint32_t r, bool } void -PluginPinDialog::update_element_pos () +PluginPinWidget::update_element_pos () { /* layout sizes */ _innerwidth = _width - 2. * _margin_x; @@ -692,7 +726,7 @@ PluginPinDialog::update_element_pos () } void -PluginPinDialog::set_color (cairo_t* cr, bool midi) +PluginPinWidget::set_color (cairo_t* cr, bool midi) { // see also gtk2_ardour/processor_box.cc static const uint32_t audio_port_color = 0x4A8A0EFF; // Green @@ -712,7 +746,7 @@ PluginPinDialog::set_color (cairo_t* cr, bool midi) } void -PluginPinDialog::draw_io_pin (cairo_t* cr, const CtrlWidget& w) +PluginPinWidget::draw_io_pin (cairo_t* cr, const CtrlWidget& w) { if (w.e->sc) { const double dy = w.h * .5; @@ -758,7 +792,7 @@ PluginPinDialog::draw_io_pin (cairo_t* cr, const CtrlWidget& w) } void -PluginPinDialog::draw_plugin_pin (cairo_t* cr, const CtrlWidget& w) +PluginPinWidget::draw_plugin_pin (cairo_t* cr, const CtrlWidget& w) { const double dx = w.w * .5; const double dy = w.h * .5; @@ -809,14 +843,14 @@ PluginPinDialog::draw_plugin_pin (cairo_t* cr, const CtrlWidget& w) } double -PluginPinDialog::pin_x_pos (uint32_t i, double x0, double width, uint32_t n_total, uint32_t n_midi, bool midi) +PluginPinWidget::pin_x_pos (uint32_t i, double x0, double width, uint32_t n_total, uint32_t n_midi, bool midi) { if (!midi) { i += n_midi; } return rint (x0 + (i + 1) * width / (1. + n_total)) - .5; } -const PluginPinDialog::CtrlWidget& -PluginPinDialog::get_io_ctrl (CtrlType ct, DataType dt, uint32_t id, uint32_t ip) const +const PluginPinWidget::CtrlWidget& +PluginPinWidget::get_io_ctrl (CtrlType ct, DataType dt, uint32_t id, uint32_t ip) const { for (CtrlElemList::const_iterator i = _elements.begin (); i != _elements.end (); ++i) { if (i->e->ct == ct && i->e->dt == dt && i->e->id == id && i->e->ip == ip) { @@ -833,7 +867,7 @@ PluginPinDialog::get_io_ctrl (CtrlType ct, DataType dt, uint32_t id, uint32_t ip } void -PluginPinDialog::edge_coordinates (const CtrlWidget& w, double &x, double &y) +PluginPinWidget::edge_coordinates (const CtrlWidget& w, double &x, double &y) { switch (w.e->ct) { case Input: @@ -861,7 +895,7 @@ PluginPinDialog::edge_coordinates (const CtrlWidget& w, double &x, double &y) } void -PluginPinDialog::draw_connection (cairo_t* cr, double x0, double x1, double y0, double y1, bool midi, bool horiz, bool dashed) +PluginPinWidget::draw_connection (cairo_t* cr, double x0, double x1, double y0, double y1, bool midi, bool horiz, bool dashed) { const double bz = 2 * _pin_box_size; double bc = (dashed && x0 == x1) ? 1.25 * _pin_box_size : 0; @@ -888,7 +922,7 @@ PluginPinDialog::draw_connection (cairo_t* cr, double x0, double x1, double y0, } void -PluginPinDialog::draw_connection (cairo_t* cr, const CtrlWidget& w0, const CtrlWidget& w1, bool dashed) +PluginPinWidget::draw_connection (cairo_t* cr, const CtrlWidget& w0, const CtrlWidget& w1, bool dashed) { double x0, x1, y0, y1; edge_coordinates (w0, x0, y0); @@ -899,7 +933,7 @@ PluginPinDialog::draw_connection (cairo_t* cr, const CtrlWidget& w0, const CtrlW bool -PluginPinDialog::darea_expose_event (GdkEventExpose* ev) +PluginPinWidget::darea_expose_event (GdkEventExpose* ev) { Gtk::Allocation a = darea.get_allocation (); double const width = a.get_width (); @@ -958,15 +992,22 @@ PluginPinDialog::darea_expose_event (GdkEventExpose* ev) cairo_set_source_rgba (cr, 1., 1., 1., 1.); pango_cairo_show_layout (cr, layout->gobj ()); - if (_pi->signal_latency () > 0) { - // TODO: this needs a better location also format to msec (and cache) +#ifndef NDEBUG + if (_pi->signal_latency () > 0 || !_pi->inplace()) { layout->set_width ((_innerwidth - 2 * _pin_box_size) * PANGO_SCALE); - layout->set_text (string_compose (_("Latency %1 spl"), _pi->signal_latency ())); + if (_pi->signal_latency () > 0 && !_pi->inplace()) { + layout->set_text (string_compose (_("Latency %1 spl%2 %3"), _pi->signal_latency (), ", ", _("no-inplace"))); + } else if (_pi->signal_latency () > 0) { + layout->set_text (string_compose (_("Latency %1 spl"), _pi->signal_latency ())); + } else { + layout->set_text (_("no-inplace")); + } layout->get_pixel_size (text_width, text_height); cairo_move_to (cr, _margin_x + _pin_box_size * .5, _margin_y + 2); cairo_set_source_rgba (cr, 1., 1., 1., 1.); pango_cairo_show_layout (cr, layout->gobj ()); } +#endif if (_pi->strict_io () && !Profile->get_mixbus ()) { layout->set_text (_("Strict I/O")); @@ -985,14 +1026,14 @@ PluginPinDialog::darea_expose_event (GdkEventExpose* ev) } /* draw midi-bypass (behind) */ - if (_pi->has_midi_bypass ()) { + if (_has_midi_bypass) { const CtrlWidget& cw0 = get_io_ctrl (Input, DataType::MIDI, 0); const CtrlWidget& cw1 = get_io_ctrl (Output, DataType::MIDI, 0); draw_connection (cr, cw0, cw1, true); } /* thru connections */ - const ChanMapping::Mappings thru_map = _pi->thru_map ().mappings (); + const ChanMapping::Mappings thru_map (_thru_map.mappings ()); for (ChanMapping::Mappings::const_iterator t = thru_map.begin (); t != thru_map.end (); ++t) { for (ChanMapping::TypeMapping::const_iterator c = (*t).second.begin (); c != (*t).second.end () ; ++c) { const CtrlWidget& cw0 = get_io_ctrl (Output, t->first, c->first); @@ -1003,7 +1044,6 @@ PluginPinDialog::darea_expose_event (GdkEventExpose* ev) } } - /* plugins & connection wires */ for (uint32_t i = 0; i < _n_plugins; ++i) { double x0 = _margin_x + rint ((i + .5) * _innerwidth / (double)(_n_plugins)) - .5; @@ -1020,8 +1060,8 @@ PluginPinDialog::darea_expose_event (GdkEventExpose* ev) cairo_set_source_rgba (cr, 1., 1., 1., 1.); pango_cairo_show_layout (cr, layout->gobj ()); - const ChanMapping::Mappings in_map = _pi->input_map (i).mappings (); - const ChanMapping::Mappings out_map = _pi->output_map (i).mappings (); + const ChanMapping::Mappings in_map = _in_map[i].mappings (); + const ChanMapping::Mappings out_map = _out_map[i].mappings (); for (ChanMapping::Mappings::const_iterator t = in_map.begin (); t != in_map.end (); ++t) { for (ChanMapping::TypeMapping::const_iterator c = (*t).second.begin (); c != (*t).second.end () ; ++c) { @@ -1086,20 +1126,20 @@ PluginPinDialog::darea_expose_event (GdkEventExpose* ev) } void -PluginPinDialog::darea_size_request (Gtk::Requisition* req) +PluginPinWidget::darea_size_request (Gtk::Requisition* req) { req->width = _min_width; req->height = _min_height; } void -PluginPinDialog::darea_size_allocate (Gtk::Allocation&) +PluginPinWidget::darea_size_allocate (Gtk::Allocation&) { _position_valid = false; } bool -PluginPinDialog::drag_type_matches (const CtrlElem& e) +PluginPinWidget::drag_type_matches (const CtrlElem& e) { if (!_dragging || !_selection) { return true; @@ -1117,13 +1157,13 @@ PluginPinDialog::drag_type_matches (const CtrlElem& e) } void -PluginPinDialog::start_drag (const CtrlElem& e, double x, double y) +PluginPinWidget::start_drag (const CtrlElem& e, double x, double y) { assert (_selection == e); _drag_dst.reset (); if (e->ct == Sink) { bool valid; - const ChanMapping& map (_pi->input_map (e->ip)); + const ChanMapping& map (_in_map[e->ip]); uint32_t idx = map.get (e->dt, e->id, &valid); if (valid) { const CtrlWidget& cw = get_io_ctrl (Input, e->dt, idx, 0); @@ -1134,7 +1174,7 @@ PluginPinDialog::start_drag (const CtrlElem& e, double x, double y) else if (e->ct == Output) { for (uint32_t i = 0; i < _n_plugins; ++i) { bool valid; - const ChanMapping& map (_pi->output_map (i)); + const ChanMapping& map (_out_map[i]); uint32_t idx = map.get_src (e->dt, e->id, &valid); if (valid) { const CtrlWidget& cw = get_io_ctrl (Source, e->dt, idx, i); @@ -1145,7 +1185,7 @@ PluginPinDialog::start_drag (const CtrlElem& e, double x, double y) } if (!_drag_dst) { bool valid; - const ChanMapping& map (_pi->thru_map ()); + const ChanMapping& map (_thru_map); uint32_t idx = map.get (e->dt, e->id, &valid); if (valid) { const CtrlWidget& cw = get_io_ctrl (Input, e->dt, idx, 0); @@ -1160,7 +1200,7 @@ PluginPinDialog::start_drag (const CtrlElem& e, double x, double y) } bool -PluginPinDialog::darea_motion_notify_event (GdkEventMotion* ev) +PluginPinWidget::darea_motion_notify_event (GdkEventMotion* ev) { bool changed = false; _hover.reset (); @@ -1188,7 +1228,7 @@ PluginPinDialog::darea_motion_notify_event (GdkEventMotion* ev) } bool -PluginPinDialog::darea_button_press_event (GdkEventButton* ev) +PluginPinWidget::darea_button_press_event (GdkEventButton* ev) { if (ev->type != GDK_BUTTON_PRESS) { return false; @@ -1241,7 +1281,7 @@ PluginPinDialog::darea_button_press_event (GdkEventButton* ev) } bool -PluginPinDialog::darea_button_release_event (GdkEventButton* ev) +PluginPinWidget::darea_button_release_event (GdkEventButton* ev) { if (_dragging && _selection && _drag_dst && _drag_dst == _hover) { // select click. (or re-connect same) @@ -1301,7 +1341,7 @@ PluginPinDialog::darea_button_release_event (GdkEventButton* ev) } void -PluginPinDialog::handle_input_action (const CtrlElem &s, const CtrlElem &i) +PluginPinWidget::handle_input_action (const CtrlElem &s, const CtrlElem &i) { const int pc = s->ip; bool valid; @@ -1331,7 +1371,7 @@ PluginPinDialog::handle_input_action (const CtrlElem &s, const CtrlElem &i) } void -PluginPinDialog::disconnect_other_outputs (uint32_t skip_pc, DataType dt, uint32_t id) +PluginPinWidget::disconnect_other_outputs (uint32_t skip_pc, DataType dt, uint32_t id) { _ignore_updates = true; for (uint32_t n = 0; n < _n_plugins; ++n) { @@ -1350,7 +1390,7 @@ PluginPinDialog::disconnect_other_outputs (uint32_t skip_pc, DataType dt, uint32 } void -PluginPinDialog::disconnect_other_thru (DataType dt, uint32_t id) +PluginPinWidget::disconnect_other_thru (DataType dt, uint32_t id) { _ignore_updates = true; bool valid; @@ -1364,7 +1404,7 @@ PluginPinDialog::disconnect_other_thru (DataType dt, uint32_t id) } void -PluginPinDialog::handle_output_action (const CtrlElem &s, const CtrlElem &o) +PluginPinWidget::handle_output_action (const CtrlElem &s, const CtrlElem &o) { const uint32_t pc = s->ip; bool valid; @@ -1399,7 +1439,7 @@ PluginPinDialog::handle_output_action (const CtrlElem &s, const CtrlElem &o) } void -PluginPinDialog::handle_thru_action (const CtrlElem &o, const CtrlElem &i) +PluginPinWidget::handle_thru_action (const CtrlElem &o, const CtrlElem &i) { bool valid; ChanMapping thru_map (_pi->thru_map ()); @@ -1421,7 +1461,7 @@ PluginPinDialog::handle_thru_action (const CtrlElem &o, const CtrlElem &i) } bool -PluginPinDialog::handle_disconnect (const CtrlElem &e, bool no_signal) +PluginPinWidget::handle_disconnect (const CtrlElem &e, bool no_signal) { _ignore_updates = true; bool changed = false; @@ -1509,14 +1549,14 @@ PluginPinDialog::handle_disconnect (const CtrlElem &e, bool no_signal) } void -PluginPinDialog::toggle_sidechain () +PluginPinWidget::toggle_sidechain () { if (_session && _session->actively_recording ()) { return; } _route ()->add_remove_sidechain (_pi, !_pi->has_sidechain ()); } void -PluginPinDialog::connect_sidechain () +PluginPinWidget::connect_sidechain () { if (!_session) { return; } @@ -1532,23 +1572,23 @@ PluginPinDialog::connect_sidechain () } void -PluginPinDialog::reset_configuration () +PluginPinWidget::reset_configuration () { if (_set_config.get_active ()) { _route ()->reset_plugin_insert (_pi); } else { - _route ()->customize_plugin_insert (_pi, _n_plugins, _out); + _route ()->customize_plugin_insert (_pi, _n_plugins, _out, _sinks); } } void -PluginPinDialog::reset_mapping () +PluginPinWidget::reset_mapping () { _pi->reset_map (); } void -PluginPinDialog::select_output_preset (uint32_t n_audio) +PluginPinWidget::select_output_preset (uint32_t n_audio) { if (_session && _session->actively_recording ()) { return; } ChanCount out (DataType::AUDIO, n_audio); @@ -1556,26 +1596,39 @@ PluginPinDialog::select_output_preset (uint32_t n_audio) } void -PluginPinDialog::add_remove_plugin_clicked (bool add) +PluginPinWidget::add_remove_plugin_clicked (bool add) { if (_session && _session->actively_recording ()) { return; } ChanCount out = _out; + ChanCount sinks = _sinks; assert (add || _n_plugins > 0); - _route ()->customize_plugin_insert (_pi, _n_plugins + (add ? 1 : -1), out); + _route ()->customize_plugin_insert (_pi, _n_plugins + (add ? 1 : -1), out, sinks); } void -PluginPinDialog::add_remove_port_clicked (bool add, ARDOUR::DataType dt) +PluginPinWidget::add_remove_port_clicked (bool add, ARDOUR::DataType dt) { if (_session && _session->actively_recording ()) { return; } ChanCount out = _out; + ChanCount sinks = _sinks; assert (add || out.get (dt) > 0); out.set (dt, out.get (dt) + (add ? 1 : -1)); - _route ()->customize_plugin_insert (_pi, _n_plugins, out); + _route ()->customize_plugin_insert (_pi, _n_plugins, out, sinks); +} + +void +PluginPinWidget::add_remove_inpin_clicked (bool add, ARDOUR::DataType dt) +{ + if (_session && _session->actively_recording ()) { return; } + ChanCount out = _out; + ChanCount sinks = _sinks; + assert (add || sinks.get (dt) > 0); + sinks.set (dt, sinks.get (dt) + (add ? 1 : -1)); + _route ()->customize_plugin_insert (_pi, _n_plugins, out, sinks); } void -PluginPinDialog::add_sidechain_port (DataType dt) +PluginPinWidget::add_sidechain_port (DataType dt) { if (_session && _session->actively_recording ()) { return; } boost::shared_ptr io = _pi->sidechain_input (); @@ -1589,7 +1642,7 @@ PluginPinDialog::add_sidechain_port (DataType dt) } void -PluginPinDialog::remove_port (boost::weak_ptr wp) +PluginPinWidget::remove_port (boost::weak_ptr wp) { if (_session && _session->actively_recording ()) { return; } boost::shared_ptr p = wp.lock (); @@ -1601,7 +1654,7 @@ PluginPinDialog::remove_port (boost::weak_ptr wp) } void -PluginPinDialog::disconnect_port (boost::weak_ptr wp) +PluginPinWidget::disconnect_port (boost::weak_ptr wp) { if (_session && _session->actively_recording ()) { return; } boost::shared_ptr p = wp.lock (); @@ -1613,7 +1666,7 @@ PluginPinDialog::disconnect_port (boost::weak_ptr wp) } void -PluginPinDialog::connect_port (boost::weak_ptr wp0, boost::weak_ptr wp1) +PluginPinWidget::connect_port (boost::weak_ptr wp0, boost::weak_ptr wp1) { if (_session && _session->actively_recording ()) { return; } boost::shared_ptr p0 = wp0.lock (); @@ -1629,7 +1682,7 @@ PluginPinDialog::connect_port (boost::weak_ptr wp0, boost::weak_pt } void -PluginPinDialog::add_send_from (boost::weak_ptr wp, boost::weak_ptr wr) +PluginPinWidget::add_send_from (boost::weak_ptr wp, boost::weak_ptr wr) { if (_session && _session->actively_recording ()) { return; } boost::shared_ptr p = wp.lock (); @@ -1640,7 +1693,7 @@ PluginPinDialog::add_send_from (boost::weak_ptr wp, boost::weak_pt } boost::shared_ptr sendpan (new Pannable (*_session)); - boost::shared_ptr send (new Send (*_session, sendpan, r->mute_master ())); + boost::shared_ptr send (new Send (*_session, r->pannable (), r->mute_master ())); const ChanCount& outs (r->amp ()->input_streams ()); try { Glib::Threads::Mutex::Lock lm (AudioEngine::instance ()->process_lock ()); @@ -1650,8 +1703,15 @@ PluginPinDialog::add_send_from (boost::weak_ptr wp, boost::weak_pt return; } - _ignore_updates = true; + std::string sendname = send->name (); + string::size_type last_letter = sendname.find_last_not_of ("0123456789"); + if (last_letter != string::npos) { + send->output ()->set_pretty_name (string_compose (_("SC %1 (%2)"), + r->name (), + sendname.substr (last_letter + 1))); + } + _ignore_updates = true; p->disconnect_all (); DataType dt = p->type (); @@ -1667,7 +1727,7 @@ PluginPinDialog::add_send_from (boost::weak_ptr wp, boost::weak_pt } bool -PluginPinDialog::sc_input_release (GdkEventButton *ev) +PluginPinWidget::sc_input_release (GdkEventButton *ev) { if (_session && _session->actively_recording ()) { return false; } if (ev->button == 3) { @@ -1683,7 +1743,7 @@ struct RouteCompareByName { }; bool -PluginPinDialog::sc_input_press (GdkEventButton *ev, boost::weak_ptr wp) +PluginPinWidget::sc_input_press (GdkEventButton *ev, boost::weak_ptr wp) { using namespace Menu_Helpers; if (!_session || _session->actively_recording ()) { return false; } @@ -1696,7 +1756,7 @@ PluginPinDialog::sc_input_press (GdkEventButton *ev, boost::weak_ptr p = wp.lock (); if (p && p->connected ()) { - citems.push_back (MenuElem (_("Disconnect"), sigc::bind (sigc::mem_fun (*this, &PluginPinDialog::disconnect_port), wp))); + citems.push_back (MenuElem (_("Disconnect"), sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::disconnect_port), wp))); citems.push_back (SeparatorElem ()); } @@ -1721,14 +1781,14 @@ PluginPinDialog::sc_input_press (GdkEventButton *ev, boost::weak_ptr 0) { citems.push_back (SeparatorElem ()); } - citems.push_back (MenuElem (_("Routing Grid"), sigc::mem_fun (*this, &PluginPinDialog::connect_sidechain))); + citems.push_back (MenuElem (_("Routing Grid"), sigc::mem_fun (*this, &PluginPinWidget::connect_sidechain))); input_menu.popup (1, ev->time); } return false; } uint32_t -PluginPinDialog::maybe_add_route_to_input_menu (boost::shared_ptr r, DataType dt, boost::weak_ptr wp) +PluginPinWidget::maybe_add_route_to_input_menu (boost::shared_ptr r, DataType dt, boost::weak_ptr wp) { uint32_t added = 0; using namespace Menu_Helpers; @@ -1756,31 +1816,21 @@ PluginPinDialog::maybe_add_route_to_input_menu (boost::shared_ptr r, Data if (send->output ()->connected_to (_pi->sidechain_input ())) { // only if (send->remove_on_disconnect ()) ?? already_present = true; - ++nth; - continue; - } -#if 1 // add existing sends that are not connected - PortSet& p (send->output ()->ports ()); - for (PortSet::iterator i = p.begin (dt); i != p.end (dt); ++i) { - std::string n = i->name (); - replace_all (n, "_", " "); - citems.push_back (MenuElem (n, sigc::bind (sigc::mem_fun (*this, &PluginPinDialog::connect_port), wp, boost::weak_ptr (*i)))); - ++added; + break; } -#endif ++nth; } /* 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, &PluginPinDialog::add_send_from), wp, boost::weak_ptr (r)))); + citems.push_back (MenuElemNoMnemonic (r->name (), sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_send_from), wp, boost::weak_ptr (r)))); ++added; } return added; } void -PluginPinDialog::port_connected_or_disconnected (boost::weak_ptr w0, boost::weak_ptr w1) +PluginPinWidget::port_connected_or_disconnected (boost::weak_ptr w0, boost::weak_ptr w1) { boost::shared_ptr p0 = w0.lock (); boost::shared_ptr p1 = w1.lock (); @@ -1797,7 +1847,7 @@ PluginPinDialog::port_connected_or_disconnected (boost::weak_ptr w } /* lifted from ProcessorEntry::Control */ -PluginPinDialog::Control::Control (boost::shared_ptr c, string const & n) +PluginPinWidget::Control::Control (boost::shared_ptr c, string const & n) : _control (c) , _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain ()), 0, 1, 0.01, 0.1) , _slider (&_adjustment, boost::shared_ptr (), 0, max (13.f, rintf (13.f * UIConfiguration::instance ().get_ui_scale ()))) @@ -1854,27 +1904,25 @@ PluginPinDialog::Control::Control (boost::shared_ptr c, strin set_no_tooltip_whatsoever (_slider); } -PluginPinDialog::Control::~Control () +PluginPinWidget::Control::~Control () { timer_connection.disconnect (); } void -PluginPinDialog::Control::set_tooltip () +PluginPinWidget::Control::set_tooltip () { boost::shared_ptr c = _control.lock (); 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); } void -PluginPinDialog::Control::slider_adjusted () +PluginPinWidget::Control::slider_adjusted () { if (_ignore_ui_adjustment) { return; @@ -1889,7 +1937,7 @@ PluginPinDialog::Control::slider_adjusted () void -PluginPinDialog::Control::control_changed () +PluginPinWidget::Control::control_changed () { boost::shared_ptr c = _control.lock (); if (!c) { @@ -1908,3 +1956,104 @@ PluginPinDialog::Control::control_changed () _ignore_ui_adjustment = false; } + + + +PluginPinDialog::PluginPinDialog (boost::shared_ptr pi) + : ArdourWindow (string_compose (_("Pin Configuration: %1"), pi->name ())) +{ + ppw.push_back (PluginPinWidgetPtr(new PluginPinWidget (pi))); + add (*ppw.back()); +} + + +PluginPinDialog::PluginPinDialog (boost::shared_ptr r) + : ArdourWindow (string_compose (_("Pin Configuration: %1"), r->name ())) + , _route (r) + , _height_mapped (false) +{ + vbox = manage (new 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)); + + _route->processors_changed.connect ( + _route_connections, invalidator (*this), boost::bind (&PluginPinDialog::route_processors_changed, this, _1), gui_context() + ); + + _route->DropReferences.connect ( + _route_connections, invalidator (*this), boost::bind (&PluginPinDialog::route_going_away, this), gui_context() + ); +} +void +PluginPinDialog::set_session (ARDOUR::Session *s) +{ + SessionHandlePtr::set_session (s); + for (PluginPinWidgetList::iterator i = ppw.begin(); i != ppw.end(); ++i) { + (*i)->set_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 (); + _height_mapped = false; + scroller->remove (); + vbox = manage (new VBox ()); + 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 +PluginPinDialog::route_going_away () +{ + ppw.clear (); + _route.reset (); + remove (); +} + +void +PluginPinDialog::add_processor (boost::weak_ptr p) +{ + boost::shared_ptr proc = p.lock (); + if (!proc || !proc->display_to_user ()) { + return; + } + boost::shared_ptr pi = boost::dynamic_pointer_cast (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()); + } else { + HBox* hbox = manage (new HBox ()); + 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, false, false); + hbox->show_all (); + } +}