X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.cc;h=c01d9e497cc976551a2ae5652f86d7e9e4b29224;hb=a450024c56a6a023a985adea4c542f9cc02dd6f3;hp=d15f7e7481f7636fc722b6dbb1b1b61d59ba1a0d;hpb=d1580ba9249eacb8c2096dd83e75ab981009bf9f;p=ardour.git diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index d15f7e7481..c01d9e497c 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -86,7 +86,7 @@ #include "tooltips.h" #include "new_plugin_preset_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" #ifdef AUDIOUNIT_SUPPORT class AUPluginUI; @@ -109,6 +109,7 @@ RefPtr ProcessorBox::cut_action; RefPtr ProcessorBox::copy_action; RefPtr ProcessorBox::rename_action; RefPtr ProcessorBox::delete_action; +RefPtr ProcessorBox::backspace_action; RefPtr ProcessorBox::manage_pins_action; RefPtr ProcessorBox::edit_action; RefPtr ProcessorBox::edit_generic_action; @@ -147,6 +148,8 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr pi = boost::dynamic_pointer_cast (_processor); - if (pi && pi->plugin() && pi->plugin()->get_info()->type != ARDOUR::Lua) { + if (pi && pi->plugin()) { _plugin_preset_pointer = PluginPresetPtr (new PluginPreset (pi->plugin()->get_info())); } } @@ -179,11 +182,11 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr pi = boost::dynamic_pointer_cast (_processor); if (pi && pi->plugin() && pi->plugin()->has_inline_display()) { if (pi->plugin()->get_info()->type != ARDOUR::Lua) { - _plugin_display = new PluginDisplay (pi->plugin(), + _plugin_display = new PluginDisplay (*this, pi->plugin(), std::max (60.f, rintf(112.f * UIConfiguration::instance().get_ui_scale()))); } else { assert (boost::dynamic_pointer_cast(pi->plugin())); - _plugin_display = new LuaPluginDisplay (boost::dynamic_pointer_cast(pi->plugin()), + _plugin_display = new LuaPluginDisplay (*this, boost::dynamic_pointer_cast(pi->plugin()), std::max (60.f, rintf(112.f * UIConfiguration::instance().get_ui_scale()))); } _vbox.pack_start (*_plugin_display); @@ -192,17 +195,21 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptrshow (); } } + _vbox.pack_end (output_routing_icon); _vbox.pack_end (output_icon); - _button.set_active (_processor->active()); + _button.set_active (_processor->enabled ()); - routing_icon.set_no_show_all(true); input_icon.set_no_show_all(true); + routing_icon.set_no_show_all(true); + output_icon.set_no_show_all(true); + output_routing_icon.set_no_show_all(true); _button.show (); - routing_icon.hide(); input_icon.hide(); output_icon.show(); + routing_icon.hide(); + output_routing_icon.hide(); _processor->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_active_changed, this), gui_context()); _processor->PropertyChanged.connect (name_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context()); @@ -375,6 +382,13 @@ ProcessorEntry::setup_visuals () _button.set_name ("processor stub"); return; } + boost::shared_ptr send; + if ((send = boost::dynamic_pointer_cast (_processor))) { + if (send->remove_on_disconnect ()) { + _button.set_name ("processor sidechain"); + return; + } + } switch (_position) { case PreFader: @@ -426,11 +440,11 @@ ProcessorEntry::led_clicked(GdkEventButton *ev) _parent->all_visible_processors_active(false); if (_position == Fader) { - _processor->deactivate (); + _processor->enable (false); } } else { - _processor->deactivate (); + _processor->enable (false); } } else { @@ -438,11 +452,11 @@ ProcessorEntry::led_clicked(GdkEventButton *ev) _parent->all_visible_processors_active(true); if (_position == Fader) { - _processor->activate (); + _processor->enable (true); } } else { - _processor->activate (); + _processor->enable (true); } } } @@ -452,7 +466,7 @@ void ProcessorEntry::processor_active_changed () { if (_processor) { - _button.set_active (_processor->active()); + _button.set_active (_processor->enabled ()); } } @@ -472,6 +486,7 @@ ProcessorEntry::processor_configuration_changed (const ChanCount in, const ChanC input_icon.queue_draw(); output_icon.queue_draw(); routing_icon.queue_draw(); + output_routing_icon.queue_draw(); } void @@ -499,6 +514,16 @@ ProcessorEntry::setup_tooltip () string_compose (_("%1\nThe Plugin is not available on this system\nand has been replaced by a stub."), name (Wide))); return; } + boost::shared_ptr send; + if ((send = boost::dynamic_pointer_cast (_processor)) != 0 && + !boost::dynamic_pointer_cast(_processor)) { + if (send->remove_on_disconnect ()) { + ARDOUR_UI_UTILS::set_tooltip (_button, string_compose ("> %1\nThis (sidechain) send will be removed when disconnected.", _processor->name())); + } else { + ARDOUR_UI_UTILS::set_tooltip (_button, string_compose ("> %1", _processor->name())); + } + return; + } } ARDOUR_UI_UTILS::set_tooltip (_button, string_compose ("%1", name (Wide))); } @@ -517,19 +542,52 @@ ProcessorEntry::name (Width w) const !boost::dynamic_pointer_cast(_processor)) { name_display += '>'; + std::string send_name; + bool pretty_ok = true; + + if (send->remove_on_disconnect ()) { + // assume it's a sidechain, find pretty name of connected port(s) + PortSet& ps (send->output ()->ports ()); + for (PortSet::iterator i = ps.begin (); i != ps.end () && pretty_ok; ++i) { + vector connections; + if (i->get_connections (connections)) { + vector::const_iterator ci; + for (ci = connections.begin(); ci != connections.end(); ++ci) { + std::string pn = AudioEngine::instance()->get_pretty_name_by_name (*ci); + if (pn.empty ()) { + continue; + } + if (send_name.empty ()) { + send_name = pn; + } else if (send_name != pn) { + // pretty names don't match + pretty_ok = false; + break; + } + } + } + } + } - /* grab the send name out of its overall name */ + if (!pretty_ok) { + send_name = ""; + } - string::size_type lbracket, rbracket; - lbracket = send->name().find ('['); - rbracket = send->name().find (']'); + /* grab the send name out of its overall name */ + if (send_name.empty()) { + send_name = send->name(); + string::size_type lbracket, rbracket; + lbracket = send_name.find ('['); + rbracket = send_name.find (']'); + send_name = send_name.substr (lbracket+1, lbracket-rbracket-1); + } switch (w) { case Wide: - name_display += send->name().substr (lbracket+1, lbracket-rbracket-1); + name_display += send_name; break; case Narrow: - name_display += PBD::short_version (send->name().substr (lbracket+1, lbracket-rbracket-1), 4); + name_display += PBD::short_version (send_name, 5); break; } @@ -600,7 +658,7 @@ ProcessorEntry::set_control_state (XMLNode const * node) if (_plugin_display) { XMLNode* n = GUIObjectState::get_node (node, X_("InlineDisplay")); - XMLProperty* p = n ? n->property (X_("visible")) : NULL; + XMLProperty const * p = n ? n->property (X_("visible")) : NULL; if (p) { if (string_is_affirmative (p->value ())) { _plugin_display->show(); @@ -890,7 +948,7 @@ ProcessorEntry::Control::set_state (XMLNode const * node) { XMLNode* n = GUIObjectState::get_node (node, state_id ()); if (n) { - XMLProperty* p = n->property (X_("visible")); + XMLProperty const * p = n->property (X_("visible")); set_visible (p && string_is_affirmative (p->value ())); } else { set_visible (false); @@ -949,6 +1007,7 @@ PluginInsertProcessorEntry::iomap_changed () { _parent->setup_routing_feeds (); routing_icon.queue_draw(); + output_routing_icon.queue_draw(); } void @@ -982,29 +1041,32 @@ ProcessorEntry::PortIcon::on_expose_event (GdkEventExpose* ev) cairo_fill (cr); const double dx = rint(max(2., 2. * UIConfiguration::instance().get_ui_scale())); - if (_ports.n_total() > 1) { - for (uint32_t i = 0; i < _ports.n_total(); ++i) { - set_routing_color (cr, i < _ports.n_midi()); - const float x = rintf(width * (.2f + .6f * i / (_ports.n_total() - 1.f))); - cairo_rectangle (cr, x-dx * .5, 0, 1+dx, height); - cairo_fill(cr); - } - } else if (_ports.n_total() == 1) { - set_routing_color (cr, _ports.n_midi() == 1); - const float x = rintf(width * .5); - cairo_rectangle (cr, x-dx * .5, 0, 1+dx, height); + for (uint32_t i = 0; i < _ports.n_total(); ++i) { + set_routing_color (cr, i < _ports.n_midi()); + const double x = ProcessorEntry::RoutingIcon::pin_x_pos (i, width, _ports.n_total(), 0 , false); + cairo_rectangle (cr, x - .5 - dx * .5, 0, 1 + dx, height); cairo_fill(cr); - cairo_stroke(cr); } cairo_destroy(cr); return true; } -ProcessorEntry::RoutingIcon::RoutingIcon () - : _feed (false) +ProcessorEntry::RoutingIcon::RoutingIcon (bool input) + : _fed_by (false) + , _input (input) { - set_size_request (-1, std::max (7.f, rintf(8.f * UIConfiguration::instance().get_ui_scale()))); + set_terminal (false); +} + +void +ProcessorEntry::RoutingIcon::set_terminal (bool b) { + _terminal = b; + int h = std::max (8.f, rintf(8.f * sqrt (UIConfiguration::instance().get_ui_scale()))); + if (_terminal) { + h += std::max (4.f, rintf(4.f * sqrt (UIConfiguration::instance().get_ui_scale()))); + } + set_size_request (-1, h); } void @@ -1014,43 +1076,90 @@ ProcessorEntry::RoutingIcon::set ( const ARDOUR::ChanCount& sinks, const ARDOUR::ChanCount& sources, const ARDOUR::ChanMapping& in_map, - const ARDOUR::ChanMapping& out_map) + const ARDOUR::ChanMapping& out_map, + const ARDOUR::ChanMapping& thru_map) { - _in = in; _out = out; - _sources = sources; _sinks = sinks; - _in_map = in_map; _out_map = out_map; - + _in = in; + _out = out; + _sources = sources; + _sinks = sinks; + _in_map = in_map; + _out_map = out_map; + _thru_map = thru_map; } bool -ProcessorEntry::RoutingIcon::identity () const { +ProcessorEntry::RoutingIcon::in_identity () const { + if (_thru_map.n_total () > 0) { + return false; + } if (!_in_map.is_monotonic () || !_in_map.is_identity ()) { return false; } - if (_in_map.count () != _sinks.n_total () || _in.n_total () != _sinks.n_total ()) { + if (_in_map.n_total () != _sinks.n_total () || _in.n_total () != _sinks.n_total ()) { return false; } - if (_feed) { - if (!_f_out_map.is_monotonic () || !_f_out_map.is_identity ()) { - return false; - } - if (_f_out_map.count () != _f_sources.n_total () || _sinks != _f_sources) { - return false; - } + return true; +} + +bool +ProcessorEntry::RoutingIcon::out_identity () const { + if (_thru_map.n_total () > 0) { + // TODO skip if trhu is not connected to any of next's inputs + return false; + } + if (!_out_map.is_monotonic () || !_out_map.is_identity ()) { + return false; + } + if (_out_map.n_total () != _sources.n_total () || _out.n_total () != _sources.n_total ()) { + return false; } return true; } +bool +ProcessorEntry::RoutingIcon::can_coalesce () const { + if (_thru_map.n_total () > 0) { + return false; + } + if (_fed_by && _f_out != _f_sources) { + return false; + } + if (_fed_by && !_f_out_map.is_identity () && !_in_map.is_identity ()) { + return false; + } + if (_input && _sinks == _in && (!_fed_by || _f_out == _in)) { + return true; + } + return false; +} + void -ProcessorEntry::RoutingIcon::set_feed ( +ProcessorEntry::RoutingIcon::set_fed_by ( const ARDOUR::ChanCount& out, const ARDOUR::ChanCount& sources, - const ARDOUR::ChanMapping& out_map) + const ARDOUR::ChanMapping& out_map, + const ARDOUR::ChanMapping& thru_map) +{ + _f_out = out; + _f_sources = sources; + _f_out_map = out_map; + _f_thru_map = thru_map; + _fed_by = true; +} + +void +ProcessorEntry::RoutingIcon::set_feeding ( + const ARDOUR::ChanCount& in, + const ARDOUR::ChanCount& sinks, + const ARDOUR::ChanMapping& in_map, + const ARDOUR::ChanMapping& thru_map) { - _f_out = out; - _f_sources = sources; - _f_out_map = out_map; - _feed = true; + _i_in = in; + _i_sinks = sinks; + _i_in_map = in_map; + _i_thru_map = thru_map; + _feeding = true; } double @@ -1061,20 +1170,69 @@ ProcessorEntry::RoutingIcon::pin_x_pos (uint32_t i, double width, uint32_t n_tot assert (i == 0); return rint (width * .5) +.5; } - return rint (width * (.2 + .6 * i / (n_total - 1))) + .5; + return rint (width * (.15 + .7 * i / (n_total - 1))) + .5; } void -ProcessorEntry::RoutingIcon::draw_gnd (cairo_t* cr, double x0, double height, bool midi) +ProcessorEntry::RoutingIcon::draw_gnd (cairo_t* cr, double x0, double y0, double height, bool midi) { const double dx = 1 + rint (max(2., 2. * UIConfiguration::instance().get_ui_scale())); - const double y0 = rint (height * .66) + .5; + const double y1 = rint (height * .66) + .5; - cairo_move_to (cr, x0, height); - cairo_line_to (cr, x0, y0); - cairo_move_to (cr, x0 - dx, y0); - cairo_line_to (cr, x0 + dx, y0); + cairo_save (cr); + cairo_translate (cr, x0, y0); + cairo_move_to (cr, 0, height); + cairo_line_to (cr, 0, y1); + cairo_move_to (cr, 0 - dx, y1); + cairo_line_to (cr, 0 + dx, y1); + set_routing_color (cr, midi); + cairo_set_line_width (cr, 1.0); + cairo_stroke (cr); + cairo_restore (cr); +} + +void +ProcessorEntry::RoutingIcon::draw_sidechain (cairo_t* cr, double x0, double y0, double height, bool midi) +{ + const double dx = 1 + rint (max(2., 2. * UIConfiguration::instance().get_ui_scale())); + const double y1 = rint (height * .5) - .5; + + cairo_save (cr); + cairo_translate (cr, x0, y0); + cairo_move_to (cr, 0 - dx, height); + cairo_line_to (cr, 0, y1); + cairo_line_to (cr, 0 + dx, height); + cairo_close_path (cr); + + set_routing_color (cr, midi); + cairo_fill (cr); + cairo_restore (cr); +} + +void +ProcessorEntry::RoutingIcon::draw_thru_src (cairo_t* cr, double x0, double y0, double height, bool midi) +{ + const double rad = 1; + const double y1 = height - rad - 1.5; + + cairo_arc (cr, x0, y0 + y1, rad, 0, 2. * M_PI); + cairo_move_to (cr, x0, y0 + height - 1.5); + cairo_line_to (cr, x0, y0 + height); + set_routing_color (cr, midi); + cairo_set_line_width (cr, 1.0); + cairo_stroke (cr); +} + +void +ProcessorEntry::RoutingIcon::draw_thru_sink (cairo_t* cr, double x0, double y0, double height, bool midi) +{ + const double rad = 1; + const double y1 = rad + 1; + + cairo_arc (cr, x0, y0 + y1, rad, 0, 2. * M_PI); + cairo_move_to (cr, x0, y0); + cairo_line_to (cr, x0, y0 + 1); set_routing_color (cr, midi); cairo_set_line_width (cr, 1.0); cairo_stroke (cr); @@ -1109,7 +1267,6 @@ ProcessorEntry::RoutingIcon::on_expose_event (GdkEventExpose* ev) cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height); cairo_clip (cr); - cairo_set_line_width (cr, max (1.f, UIConfiguration::instance().get_ui_scale())); cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); Gtk::Allocation a = get_allocation(); @@ -1122,40 +1279,58 @@ ProcessorEntry::RoutingIcon::on_expose_event (GdkEventExpose* ev) cairo_rectangle (cr, 0, 0, width, height); cairo_fill (cr); - expose_map (cr, width, height); + if (_input) { + if (can_coalesce ()) { + expose_coalesced_input_map (cr, width, height); + } else { + expose_input_map (cr, width, height); + } + } else { + expose_output_map (cr, width, height); + } cairo_destroy(cr); return true; } void -ProcessorEntry::RoutingIcon::expose_map (cairo_t* cr, const double width, const double height) +ProcessorEntry::RoutingIcon::expose_coalesced_input_map (cairo_t* cr, const double width, const double height) { const uint32_t pc_in = _sinks.n_total(); const uint32_t pc_in_midi = _sinks.n_midi(); - // TODO indicate midi-bypass ?? - // show "X" for - for (uint32_t i = 0; i < pc_in; ++i) { const bool is_midi = i < pc_in_midi; bool valid_in; uint32_t pn = is_midi ? i : i - pc_in_midi; - uint32_t idx = _in_map.get (is_midi ? DataType::MIDI : DataType::AUDIO, pn, &valid_in); + DataType dt = is_midi ? DataType::MIDI : DataType::AUDIO; + uint32_t idx = _in_map.get (dt, pn, &valid_in); if (!valid_in) { - double x = pin_x_pos (i, width, pc_in, pc_in_midi, is_midi); - draw_gnd (cr, x, height, is_midi); + double x = pin_x_pos (i, width, pc_in, 0, is_midi); + draw_gnd (cr, x, 0, height, is_midi); + continue; + } + if (idx >= _in.get (dt)) { + // side-chain, probably + double x = pin_x_pos (i, width, pc_in, 0, is_midi); + draw_sidechain (cr, x, 0, height, is_midi); continue; } double c_x0; double c_x1 = pin_x_pos (i, width, pc_in, 0, false); - if (_feed) { + if (_fed_by) { bool valid_src; - uint32_t src = _f_out_map.get_src (is_midi ? DataType::MIDI : DataType::AUDIO, idx, &valid_src); + uint32_t src = _f_out_map.get_src (dt, idx, &valid_src); if (!valid_src) { double x = pin_x_pos (i, width, pc_in, 0, false); - draw_gnd (cr, x, height, is_midi); + bool valid_thru; + _f_thru_map.get (dt, idx, &valid_thru); + if (valid_thru) { + draw_thru_src (cr, x, 0, height, is_midi); + } else { + draw_gnd (cr, x, 0, height, is_midi); + } continue; } c_x0 = pin_x_pos (src, width, _f_sources.n_total(), _f_sources.n_midi(), is_midi); @@ -1166,17 +1341,194 @@ ProcessorEntry::RoutingIcon::expose_map (cairo_t* cr, const double width, const } } +void +ProcessorEntry::RoutingIcon::expose_input_map (cairo_t* cr, const double width, const double height) +{ + const uint32_t n_in = _in.n_total(); + const uint32_t n_in_midi = _in.n_midi(); + const uint32_t pc_in = _sinks.n_total(); + const uint32_t pc_in_midi = _sinks.n_midi(); -ProcessorEntry::PluginDisplay::PluginDisplay (boost::shared_ptr p, uint32_t max_height) - : _plug (p) + // draw inputs to this + for (uint32_t i = 0; i < pc_in; ++i) { + const bool is_midi = i < pc_in_midi; + bool valid_in; + uint32_t pn = is_midi ? i : i - pc_in_midi; + DataType dt = is_midi ? DataType::MIDI : DataType::AUDIO; + uint32_t idx = _in_map.get (dt, pn, &valid_in); + // check if it's fed + bool valid_src = true; + if (valid_in && idx < _in.get (dt) && _fed_by) { + bool valid_out; + bool valid_thru; + _f_out_map.get_src (dt, idx, &valid_out); + _f_thru_map.get (dt, idx, &valid_thru); + if (!valid_out && !valid_thru) { + valid_src = false; + } + } + if (!valid_in || !valid_src) { + double x = pin_x_pos (i, width, pc_in, 0, is_midi); + draw_gnd (cr, x, 0, height, is_midi); + continue; + } + if (idx >= _in.get (dt)) { + // side-chain, probably + double x = pin_x_pos (i, width, pc_in, 0, is_midi); + draw_sidechain (cr, x, 0, height, is_midi); + continue; + } + double c_x1 = pin_x_pos (i, width, pc_in, 0, false); + double c_x0 = pin_x_pos (idx, width, n_in, n_in_midi, is_midi); + draw_connection (cr, c_x0, c_x1, 0, height, is_midi); + } + + // draw reverse thru + for (uint32_t i = 0; i < n_in; ++i) { + const bool is_midi = i < n_in_midi; + bool valid_thru; + uint32_t pn = is_midi ? i : i - n_in_midi; + DataType dt = is_midi ? DataType::MIDI : DataType::AUDIO; + _thru_map.get_src (dt, pn, &valid_thru); + if (!valid_thru) { + continue; + } + double x = pin_x_pos (i, width, n_in, 0, is_midi); + draw_thru_sink (cr, x, 0, height, is_midi); + } +} + +void +ProcessorEntry::RoutingIcon::expose_output_map (cairo_t* cr, const double width, const double height) +{ + int dh = std::max (4.f, rintf(4.f * UIConfiguration::instance().get_ui_scale())); + double ht = _terminal ? height - dh : height; + + // draw outputs of this + const uint32_t pc_out = _sources.n_total(); + const uint32_t pc_out_midi = _sources.n_midi(); + const uint32_t n_out = _out.n_total(); + const uint32_t n_out_midi = _out.n_midi(); + + for (uint32_t i = 0; i < pc_out; ++i) { + const bool is_midi = i < pc_out_midi; + bool valid_out; + uint32_t pn = is_midi ? i : i - pc_out_midi; + DataType dt = is_midi ? DataType::MIDI : DataType::AUDIO; + uint32_t idx = _out_map.get (dt, pn, &valid_out); + if (!valid_out) { + continue; + } + // skip connections that are not used in the next's input + if (_feeding) { + bool valid_thru, valid_sink; + _i_in_map.get_src (dt, idx, &valid_sink); + _i_thru_map.get_src (dt, idx, &valid_thru); + if (!valid_thru && !valid_sink) { + if (!is_midi || i != 0) { // special case midi-bypass + continue; + } + } + } + double c_x0 = pin_x_pos (i, width, pc_out, 0, false); + double c_x1 = pin_x_pos (idx, width, n_out, n_out_midi, is_midi); + draw_connection (cr, c_x0, c_x1, 0, ht, is_midi); + } + + for (uint32_t i = 0; i < n_out; ++i) { + const bool is_midi = i < n_out_midi; + uint32_t pn = is_midi ? i : i - n_out_midi; + DataType dt = is_midi ? DataType::MIDI : DataType::AUDIO; + double x = pin_x_pos (i, width, n_out, 0, is_midi); + + if (!_terminal) { + bool valid_thru_f = false; + // skip connections that are not used in the next's input + if (_feeding) { + bool valid_sink; + _i_in_map.get_src (dt, pn, &valid_sink); + _i_thru_map.get_src (dt, pn, &valid_thru_f); + if (!valid_thru_f && !valid_sink) { + if (!is_midi || i != 0) { // special case midi-bypass + continue; + } + } + } + + bool valid_src; + _out_map.get_src (dt, pn, &valid_src); + if (!valid_src) { + bool valid_thru; + uint32_t idx = _thru_map.get (dt, pn, &valid_thru); + if (valid_thru) { + if (idx >= _in.get (dt)) { + draw_sidechain (cr, x, 0, height, is_midi); + } else { + draw_thru_src (cr, x, 0, height, is_midi); + } + } else if (valid_thru_f){ + // gnd is part of input, unless it's a thru input + // (also only true if !coalesced into one small display) + draw_gnd (cr, x, 0, height, is_midi); + } + } + } else { + // terminal node, add arrows + bool valid_src; + _out_map.get_src (dt, pn, &valid_src); + if (!valid_src) { + bool valid_thru; + uint32_t idx = _thru_map.get (dt, pn, &valid_thru); + if (valid_thru) { + if (idx >= _in.get (dt)) { + draw_sidechain (cr, x, 0, height - dh, is_midi); + } else { + draw_thru_src (cr, x, 0, height - dh, is_midi); + } + } else { + draw_gnd (cr, x, 0, height - dh, is_midi); + } + } + + set_routing_color (cr, is_midi); + cairo_set_line_width (cr, 1.0); + cairo_move_to (cr, x, height - dh); + cairo_line_to (cr, x, height - 2); + cairo_stroke (cr); + + const double ar = dh - 1; + cairo_move_to (cr, x - ar, height - ar); + cairo_line_to (cr, x , height - .5); + cairo_line_to (cr, x + ar, height - ar); + cairo_line_to (cr, x , height - ar * .5); + cairo_close_path (cr); + cairo_fill_preserve (cr); + cairo_stroke (cr); + } + } +} + +ProcessorEntry::PluginDisplay::PluginDisplay (ProcessorEntry& e, boost::shared_ptr p, uint32_t max_height) + : _entry (e) + , _plug (p) , _surf (0) , _max_height (max_height) , _cur_height (1) , _scroll (false) { set_name ("processor prefader"); + add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); _plug->QueueDraw.connect (_qdraw_connection, invalidator (*this), boost::bind (&Gtk::Widget::queue_draw, this), gui_context ()); + + std::string postfix = ""; + if (_plug->has_editor()) { + ARDOUR_UI_UTILS::set_tooltip (*this, + string_compose (_("%1\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, + string_compose (_("%1\nDouble-click to show generic GUI.%2"), e.name (Wide), postfix)); + } } ProcessorEntry::PluginDisplay::~PluginDisplay () @@ -1186,8 +1538,33 @@ ProcessorEntry::PluginDisplay::~PluginDisplay () } } +bool +ProcessorEntry::PluginDisplay::on_button_press_event (GdkEventButton *ev) +{ + assert (_entry.processor ()); + + // consider some tweaks to pass this up to the DnDVBox somehow: + // select processor, then call (private) + //_entry._parent->processor_button_press_event (ev, &_entry); + if (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS)) { + if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { + _entry._parent->generic_edit_processor (_entry.processor ()); + } else { + _entry._parent->edit_processor (_entry.processor ()); + } + return true; + } + return false; +} + +bool +ProcessorEntry::PluginDisplay::on_button_release_event (GdkEventButton *ev) +{ + return false; +} + void -ProcessorEntry::PluginDisplay::on_size_request (Gtk::Requisition* req) +ProcessorEntry::PluginDisplay::on_size_request (Requisition* req) { req->width = 56; req->height = _cur_height; @@ -1261,6 +1638,7 @@ ProcessorEntry::PluginDisplay::render_inline (cairo_t* cr, uint32_t width) } } + 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); @@ -1320,8 +1698,8 @@ ProcessorEntry::PluginDisplay::on_expose_event (GdkEventExpose* ev) return true; } -ProcessorEntry::LuaPluginDisplay::LuaPluginDisplay (boost::shared_ptr p, uint32_t max_height) - : PluginDisplay (p, max_height) +ProcessorEntry::LuaPluginDisplay::LuaPluginDisplay (ProcessorEntry& e, boost::shared_ptr p, uint32_t max_height) + : PluginDisplay (e, p, max_height) , _luaproc (p) , _lua_render_inline (0) { @@ -1345,12 +1723,15 @@ ProcessorEntry::LuaPluginDisplay::render_inline (cairo_t *cr, uint32_t width) Cairo::Context ctx (cr); try { luabridge::LuaRef rv = (*_lua_render_inline)((Cairo::Context *)&ctx, width, _max_height); + lua_gui.collect_garbage_step (); if (rv.isTable ()) { uint32_t h = rv[2]; return h; } } catch (luabridge::LuaException const& e) { - ; +#ifndef NDEBUG + cerr << "LuaException:" << e.what () << endl; +#endif } return 0; } @@ -1361,7 +1742,7 @@ static std::list drop_targets() std::list tmp; tmp.push_back (Gtk::TargetEntry ("processor")); // from processor-box to processor-box tmp.push_back (Gtk::TargetEntry ("PluginInfoPtr")); // from plugin-manager - tmp.push_back (Gtk::TargetEntry ("PluginPresetPtr")); // from sidebar + tmp.push_back (Gtk::TargetEntry ("PluginFavoritePtr")); // from sidebar return tmp; } @@ -1531,7 +1912,7 @@ ProcessorBox::_drop_plugin_preset (Gtk::SelectionData const &data, Route::Proces boost::shared_ptr processor (new PluginInsert (*_session, p)); if (Config->get_new_plugins_active ()) { - processor->activate (); + processor->enable (true); } pl.push_back (processor); } @@ -1554,7 +1935,7 @@ ProcessorBox::_drop_plugin (Gtk::SelectionData const &data, Route::ProcessorList } boost::shared_ptr processor (new PluginInsert (*_session, p)); if (Config->get_new_plugins_active ()) { - processor->activate (); + processor->enable (true); } pl.push_back (processor); } @@ -1573,7 +1954,7 @@ ProcessorBox::plugin_drop (Gtk::SelectionData const &data, ProcessorEntry* posit if (data.get_target() == "PluginInfoPtr") { _drop_plugin (data, pl); } - else if (data.get_target() == "PluginPresetPtr") { + else if (data.get_target() == "PluginFavoritePtr") { _drop_plugin_preset (data, pl); } else { @@ -1606,6 +1987,11 @@ ProcessorBox::object_drop (DnDVBox* source, ProcessorEntry* posi PBD::ID id = pi->id(); XMLNode& state = otherproc->get_state (); + /* strip side-chain state (processor inside processor must be a side-chain) + * otherwise we'll end up with duplicate ports-names. + * (this needs a better solution which retains connections) + */ + state.remove_nodes ("Processor"); proc->set_state (state, Stateful::loading_state_version); boost::dynamic_pointer_cast(proc)->update_id (id); return; @@ -1747,19 +2133,22 @@ ProcessorBox::show_processor_menu (int arg) } } - Gtk::MenuItem* send_menu_item = dynamic_cast(ActionManager::get_widget("/ProcessorMenu/send_options")); - if (send_menu_item) { - if (single_selection && !_route->is_monitor()) { - Menu* m = single_selection->build_send_options_menu (); - if (m && !m->items().empty()) { - send_menu_item->set_submenu (*m); - send_menu_item->set_sensitive (true); + + if (!ARDOUR::Profile->get_mixbus()) { + Gtk::MenuItem* send_menu_item = dynamic_cast(ActionManager::get_widget("/ProcessorMenu/send_options")); + if (send_menu_item) { + if (single_selection && !_route->is_monitor()) { + Menu* m = single_selection->build_send_options_menu (); + if (m && !m->items().empty()) { + send_menu_item->set_submenu (*m); + send_menu_item->set_sensitive (true); + } else { + gtk_menu_item_set_submenu (send_menu_item->gobj(), 0); + send_menu_item->set_sensitive (false); + } } else { - gtk_menu_item_set_submenu (send_menu_item->gobj(), 0); send_menu_item->set_sensitive (false); } - } else { - send_menu_item->set_sensitive (false); } } @@ -1772,6 +2161,7 @@ ProcessorBox::show_processor_menu (int arg) cut_action->set_sensitive (sensitive && can_cut ()); copy_action->set_sensitive (sensitive); delete_action->set_sensitive (sensitive || stub_processor_selected ()); + backspace_action->set_sensitive (sensitive || stub_processor_selected ()); edit_action->set_sensitive (one_processor_can_be_edited ()); edit_generic_action->set_sensitive (one_processor_can_be_edited ()); @@ -1894,11 +2284,7 @@ ProcessorBox::processor_operation (ProcessorOperation op) case ProcessorsToggleActive: for (ProcSelection::iterator i = targets.begin(); i != targets.end(); ++i) { - if ((*i)->active()) { - (*i)->deactivate (); - } else { - (*i)->activate (); - } + (*i)->enable (!(*i)->enabled ()); } break; @@ -1990,12 +2376,7 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry ) { /* button2-click with no/appropriate modifiers */ - - if (processor->active()) { - processor->deactivate (); - } else { - processor->activate (); - } + processor->enable (!processor->enabled ()); } return false; @@ -2027,49 +2408,6 @@ ProcessorBox::choose_plugin () _get_plugin_selector()->set_interested_object (*this); } -/** @return true if an error occurred, otherwise false */ -bool -ProcessorBox::choose_lua () -{ - LuaScriptInfoPtr spi; - - ScriptSelector ss (_("Add Lua DSP Processor"), LuaScriptInfo::DSP); - switch (ss.run ()) { - case Gtk::RESPONSE_ACCEPT: - spi = ss.script(); - break; - default: - return true; - } - ss.hide (); - - PluginPtr p; - try { - LuaPluginInfoPtr lpi (new LuaPluginInfo(spi)); - p = (lpi->load (*_session)); - } catch (...) { - string msg = _( - "Failed to instantiate Lua DSP Processor,\n" - "probably because the script is invalid (no dsp function)."); - MessageDialog am (msg); - am.run (); - return true; - } - - boost::shared_ptr processor (new PluginInsert (*_session, p)); - - Route::ProcessorStreams err_streams; - if (_route->add_processor_by_index (processor, _placement, &err_streams, Config->get_new_plugins_active ())) { - string msg = _( - "Failed to add Lua DSP Processor at the given position,\n" - "probably because the I/O configuration of the plugins\n" - "could not match the configuration of this track."); - MessageDialog am (msg); - am.run (); - } - return false; -} - /** @return true if an error occurred, otherwise false */ bool ProcessorBox::use_plugins (const SelectedPlugins& plugins) @@ -2156,11 +2494,10 @@ ProcessorBox::choose_insert () void ProcessorBox::choose_send () { - boost::shared_ptr sendpan(new Pannable (*_session)); - boost::shared_ptr send (new Send (*_session, sendpan, _route->mute_master())); + boost::shared_ptr send (new Send (*_session, _route->pannable (), _route->mute_master())); /* make an educated guess at the initial number of outputs for the send */ - ChanCount outs = (_session->master_out()) + ChanCount outs = (_route->n_outputs().n_audio() && _session->master_out()) ? _session->master_out()->n_outputs() : _route->n_outputs(); @@ -2358,18 +2695,13 @@ ProcessorBox::maybe_add_processor_pin_mgr (boost::weak_ptr w) PluginPinWindowProxy* wp = new PluginPinWindowProxy ( string_compose ("PM-%2-%3", _route->id(), p->id()), w); + wp->set_session (_session); const XMLNode* ui_xml = _session->extra_xml (X_("UI")); if (ui_xml) { wp->set_state (*ui_xml, 0); } - void* existing_ui = p->get_ui (); - - if (existing_ui) { - wp->use_window (*(reinterpret_cast(existing_ui))); - } - p->set_pingmgr_proxy (wp); WM::Manager::instance().register_window (wp); } @@ -2472,6 +2804,9 @@ void ProcessorBox::setup_routing_feeds () { list children = processor_display.children (); + /* first set the i/o maps for every processor */ + list::iterator prev = children.begin(); + for (list::iterator i = children.begin(); i != children.end(); ++i) { boost::shared_ptr p = (*i)->processor(); boost::shared_ptr pi = boost::dynamic_pointer_cast (p); @@ -2486,23 +2821,36 @@ ProcessorBox::setup_routing_feeds () ChanCount in, out; pi->configured_io (in, out); + ChanCount midi_thru; ChanCount midi_bypass; + ChanMapping input_map (pi->input_map ()); + if (pi->has_midi_thru ()) { + midi_thru.set(DataType::MIDI, 1); + input_map.set (DataType::MIDI, 0, 0); + } if (pi->has_midi_bypass ()) { midi_bypass.set(DataType::MIDI, 1); } - (*i)->input_icon.set_ports (sinks * count); + (*i)->input_icon.set_ports (sinks * count + midi_thru); (*i)->output_icon.set_ports (sources * count + midi_bypass); (*i)->routing_icon.set ( in, out, - sinks * count, + sinks * count + midi_thru, sources * count + midi_bypass, - pi->input_map (), - pi->output_map ()); + input_map, + pi->output_map (), + pi->thru_map ()); if (next != children.end()) { - (*next)->routing_icon.set_feed (out, sources * count + midi_bypass, pi->output_map ()); + (*next)->routing_icon.set_fed_by (out, sources * count + midi_bypass, + pi->output_map (), pi->thru_map ()); + } + + if (prev != i) { + (*prev)->routing_icon.set_feeding (in, sinks * count + midi_thru, + pi->input_map (), pi->thru_map ()); } } else { @@ -2510,38 +2858,76 @@ ProcessorBox::setup_routing_feeds () (*i)->output_icon.set_ports (p->output_streams()); ChanMapping inmap (p->input_streams ()); ChanMapping outmap (p->input_streams ()); + ChanMapping thrumap; (*i)->routing_icon.set ( p->input_streams(), p->output_streams(), p->input_streams(), p->output_streams(), - inmap, outmap); + inmap, outmap, thrumap); if (next != children.end()) { - (*next)->routing_icon.set_feed (p->output_streams(), p->output_streams(), outmap); + (*next)->routing_icon.set_fed_by ( + p->output_streams(), + p->output_streams(), + outmap, thrumap); + } + if (prev != i) { + (*prev)->routing_icon.set_feeding ( + p->input_streams(), + p->output_streams(), + inmap, thrumap); } } if (i == children.begin()) { - (*i)->routing_icon.unset_feed (); + (*i)->routing_icon.unset_fed_by (); } + prev = i; + (*i)->input_icon.hide(); } + /* now set which icons need to be displayed */ for (list::iterator i = children.begin(); i != children.end(); ++i) { - if ((*i)->routing_icon.identity ()) { + (*i)->output_routing_icon.copy_state ((*i)->routing_icon); + + if ((*i)->routing_icon.in_identity ()) { (*i)->routing_icon.hide(); if (i == children.begin()) { (*i)->input_icon.show(); - } else { - (*i)->input_icon.hide(); } } else { (*i)->routing_icon.show(); (*i)->routing_icon.queue_draw(); (*i)->input_icon.show(); } + + list::iterator next = i; + if (++next == children.end()) { + // last processor in the chain + (*i)->output_routing_icon.set_terminal(true); + (*i)->output_routing_icon.unset_feeding (); + if ((*i)->routing_icon.out_identity ()) { + (*i)->output_routing_icon.hide(); + } else { + (*i)->output_routing_icon.show(); + (*i)->output_routing_icon.queue_draw(); + } + } else { + (*i)->output_routing_icon.set_terminal(false); + if ( !(*i)->routing_icon.out_identity () + && !(*next)->routing_icon.in_identity () + && (*next)->routing_icon.can_coalesce ()) { + (*i)->output_routing_icon.hide(); + } else if (!(*i)->routing_icon.out_identity ()) { + (*i)->output_routing_icon.show(); + (*i)->output_routing_icon.queue_draw(); + (*next)->input_icon.show(); + } else { + (*i)->output_routing_icon.hide(); + } + } } - // TODO show additional wires if outputs of last processor are not an identity map. } void @@ -2960,8 +3346,22 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr is a plugin. */ p.reset (new PluginInsert (*_session)); + /* we can't use RAII Stateful::ForceIDRegeneration + * because that'd void copying the state and wrongly bump + * the state-version counter. + * we need to load the state (incl external files) first and + * only then update the ID) + */ PBD::ID id = p->id(); - p->set_state (**niter, Stateful::current_state_version); + /* strip side-chain state (processor inside processor must be a side-chain) + * otherwise we'll end up with duplicate ports-names. + * (this needs a better solution which retains connections) + * We really would want Stateful::ForceIDRegeneration here :( + */ + XMLNode state (**niter); + state.remove_nodes ("Processor"); + + p->set_state (state, Stateful::current_state_version); boost::dynamic_pointer_cast(p)->update_id (id); } @@ -3242,8 +3642,6 @@ ProcessorBox::register_actions () myactions.register_action (processor_box_actions, X_("newplugin"), _("New Plugin"), sigc::ptr_fun (ProcessorBox::rb_choose_plugin)); - act = myactions.register_action (processor_box_actions, X_("newlua"), _("New Lua Proc"), - sigc::ptr_fun (ProcessorBox::rb_choose_lua)); act = myactions.register_action (processor_box_actions, X_("newinsert"), _("New Insert"), sigc::ptr_fun (ProcessorBox::rb_choose_insert)); ActionManager::engine_sensitive_actions.push_back (act); @@ -3271,10 +3669,13 @@ ProcessorBox::register_actions () sigc::ptr_fun (ProcessorBox::rb_copy)); delete_action = myactions.register_action (processor_box_actions, X_("delete"), _("Delete"), sigc::ptr_fun (ProcessorBox::rb_delete)); + backspace_action = myactions.register_action (processor_box_actions, X_("backspace"), _("Delete"), + sigc::ptr_fun (ProcessorBox::rb_delete)); ActionManager::plugin_selection_sensitive_actions.push_back (cut_action); ActionManager::plugin_selection_sensitive_actions.push_back (copy_action); ActionManager::plugin_selection_sensitive_actions.push_back (delete_action); + ActionManager::plugin_selection_sensitive_actions.push_back (backspace_action); paste_action = myactions.register_action (processor_box_actions, X_("paste"), _("Paste"), sigc::ptr_fun (ProcessorBox::rb_paste)); @@ -3295,7 +3696,7 @@ ProcessorBox::register_actions () sigc::ptr_fun (ProcessorBox::rb_ab_plugins)); manage_pins_action = myactions.register_action ( - processor_box_actions, X_("manage-pins"), _("Pin Management..."), + processor_box_actions, X_("manage-pins"), _("Pin Connections..."), sigc::ptr_fun (ProcessorBox::rb_manage_pins)); /* show editors */ @@ -3348,15 +3749,6 @@ ProcessorBox::rb_choose_plugin () _current_processor_box->choose_plugin (); } -void -ProcessorBox::rb_choose_lua () -{ - if (_current_processor_box == 0) { - return; - } - _current_processor_box->choose_lua (); -} - void ProcessorBox::rb_choose_insert () { @@ -3541,6 +3933,9 @@ ProcessorBox::edit_processor (boost::shared_ptr processor) if (edit_aux_send (processor)) { return; } + if (!_session->engine().connected()) { + return; + } ProcessorWindowProxy* proxy = find_window_proxy (processor); @@ -3559,6 +3954,9 @@ ProcessorBox::generic_edit_processor (boost::shared_ptr processor) if (edit_aux_send (processor)) { return; } + if (!_session->engine().connected()) { + return; + } ProcessorWindowProxy* proxy = find_window_proxy (processor); @@ -3801,7 +4199,7 @@ ProcessorWindowProxy::set_state (const XMLNode& node, int /*version*/) XMLNodeList children = node.children (); XMLNodeList::const_iterator i = children.begin (); while (i != children.end()) { - XMLProperty* prop = (*i)->property (X_("name")); + XMLProperty const * prop = (*i)->property (X_("name")); if ((*i)->name() == X_("Window") && prop && prop->value() == _name) { break; } @@ -3809,7 +4207,7 @@ ProcessorWindowProxy::set_state (const XMLNode& node, int /*version*/) } if (i != children.end()) { - XMLProperty* prop; + XMLProperty const * prop; if ((prop = (*i)->property (X_("custom-ui"))) != 0) { want_custom = PBD::string_is_affirmative (prop->value ()); } @@ -3842,8 +4240,8 @@ ProcessorWindowProxy::get (bool create) if (_window) { setup (); } + _window->show_all (); } - _window->show_all (); return _window; } @@ -3853,12 +4251,7 @@ ProcessorWindowProxy::show_the_right_window () if (_window && (is_custom != want_custom)) { /* drop existing window - wrong type */ drop_window (); - get (true); - setup (); - assert (_window); - is_custom = want_custom; } - toggle (); } @@ -3879,6 +4272,13 @@ PluginPinWindowProxy::~PluginPinWindowProxy() _window = 0; } +ARDOUR::SessionHandlePtr* +PluginPinWindowProxy::session_handle () +{ + ArdourWindow* aw = dynamic_cast (_window); + if (aw) { return aw; } + return 0; +} Gtk::Window* PluginPinWindowProxy::get (bool create) @@ -3894,9 +4294,12 @@ PluginPinWindowProxy::get (bool create) return 0; } _window = new PluginPinDialog (pi); + ArdourWindow* aw = dynamic_cast (_window); + if (aw) { + aw->set_session (_session); + } + _window->show_all (); } - - _window->show_all (); return _window; }