diff options
| -rw-r--r-- | gtk2_ardour/processor_box.cc | 119 | ||||
| -rw-r--r-- | gtk2_ardour/processor_box.h | 25 |
2 files changed, 133 insertions, 11 deletions
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index fd15ec217d..067cbf1d2d 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -147,6 +147,8 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processo , _width (w) , input_icon(true) , output_icon(false) + , routing_icon(true) + , output_routing_icon(false) , _plugin_display(0) { _vbox.show (); @@ -192,6 +194,7 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processo _plugin_display->show (); } } + _vbox.pack_end (output_routing_icon); _vbox.pack_end (output_icon); _button.set_active (_processor->active()); @@ -200,9 +203,10 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processo input_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()); @@ -472,6 +476,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 @@ -949,6 +954,7 @@ PluginInsertProcessorEntry::iomap_changed () { _parent->setup_routing_feeds (); routing_icon.queue_draw(); + output_routing_icon.queue_draw(); } void @@ -1001,10 +1007,15 @@ ProcessorEntry::PortIcon::on_expose_event (GdkEventExpose* ev) return true; } -ProcessorEntry::RoutingIcon::RoutingIcon () +ProcessorEntry::RoutingIcon::RoutingIcon (bool input) : _feed (false) + , _input (input) { - set_size_request (-1, std::max (7.f, rintf(8.f * UIConfiguration::instance().get_ui_scale()))); + if (input) { + set_size_request (-1, std::max (7.f, rintf(8.f * UIConfiguration::instance().get_ui_scale()))); + } else { + set_size_request (-1, std::max (10.f, rintf(12.f * UIConfiguration::instance().get_ui_scale()))); + } } void @@ -1041,6 +1052,17 @@ ProcessorEntry::RoutingIcon::identity () const { return true; } +bool +ProcessorEntry::RoutingIcon::out_identity () const { + if (!_out_map.is_monotonic () || !_out_map.is_identity ()) { + return false; + } + if (_out_map.count () != _sources.n_total () || _out.n_total () != _sources.n_total ()) { + return false; + } + return true; +} + void ProcessorEntry::RoutingIcon::set_feed ( const ARDOUR::ChanCount& out, @@ -1065,6 +1087,26 @@ ProcessorEntry::RoutingIcon::pin_x_pos (uint32_t i, double width, uint32_t n_tot } void +ProcessorEntry::RoutingIcon::draw_X (cairo_t* cr, double x0, double height, bool midi) +{ + const double y0 = rint (height * .4) + .5; + const double dx = min (y0 - .5, 1. + rint (max(2., 2. * UIConfiguration::instance().get_ui_scale()))); + + cairo_move_to (cr, x0, 0); + cairo_line_to (cr, x0, y0); + cairo_move_to (cr, x0 - dx, y0 - dx); + cairo_line_to (cr, x0 + dx, y0 + dx); + cairo_move_to (cr, x0 - dx, y0 + dx); + cairo_line_to (cr, x0 + dx, y0 - dx); + + set_routing_color (cr, midi); + cairo_set_line_width (cr, 1.0); + cairo_stroke_preserve (cr); + cairo_set_source_rgba (cr, 0, 0, 0, .4); // darken + cairo_stroke (cr); +} + +void ProcessorEntry::RoutingIcon::draw_gnd (cairo_t* cr, double x0, double height, bool midi) { const double dx = 1 + rint (max(2., 2. * UIConfiguration::instance().get_ui_scale())); @@ -1089,6 +1131,7 @@ ProcessorEntry::RoutingIcon::draw_sidechain (cairo_t* cr, double x0, double heig cairo_move_to (cr, x0 - dx, height); cairo_line_to (cr, x0, y0); cairo_line_to (cr, x0 + dx, height); + cairo_close_path (cr); set_routing_color (cr, midi); cairo_set_line_width (cr, 1.0); @@ -1137,14 +1180,18 @@ ProcessorEntry::RoutingIcon::on_expose_event (GdkEventExpose* ev) cairo_rectangle (cr, 0, 0, width, height); cairo_fill (cr); - expose_map (cr, width, height); + if (_input) { + 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_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(); @@ -1159,13 +1206,13 @@ ProcessorEntry::RoutingIcon::expose_map (cairo_t* cr, const double width, const 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); + double x = pin_x_pos (i, width, pc_in, 0, is_midi); draw_gnd (cr, x, height, is_midi); continue; } if (idx >= _in.get (dt)) { // side-chain, probably - double x = pin_x_pos (i, width, pc_in, pc_in_midi, is_midi); + double x = pin_x_pos (i, width, pc_in, 0, is_midi); draw_sidechain (cr, x, height, is_midi); continue; } @@ -1188,6 +1235,50 @@ ProcessorEntry::RoutingIcon::expose_map (cairo_t* cr, const double width, const } } +void +ProcessorEntry::RoutingIcon::expose_output_map (cairo_t* cr, const double width, const double height) +{ + 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) { + double x = pin_x_pos (i, width, pc_out, 0, is_midi); + draw_X (cr, x, height - 5, is_midi); + 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, height - 3, is_midi); + } + + // arrows + for (uint32_t i = 0; i < n_out; ++i) { + const bool is_midi = i < n_out_midi; + double x = pin_x_pos (i, width, n_out, 0, is_midi); + uint32_t pn = is_midi ? i : i - n_out_midi; + DataType dt = is_midi ? DataType::MIDI : DataType::AUDIO; + bool valid_src; + _out_map.get_src (dt, pn, &valid_src); + if (!valid_src) { + draw_gnd (cr, x, height, is_midi); + } + set_routing_color (cr, is_midi); + cairo_move_to (cr, x , height); + cairo_line_to (cr, x - 3, height - 3); + cairo_line_to (cr, x + 3, height - 3); + cairo_close_path (cr); + cairo_fill (cr); + } +} ProcessorEntry::PluginDisplay::PluginDisplay (boost::shared_ptr<ARDOUR::Plugin> p, uint32_t max_height) : _plug (p) @@ -2563,8 +2654,20 @@ ProcessorBox::setup_routing_feeds () (*i)->routing_icon.queue_draw(); (*i)->input_icon.show(); } + + list<ProcessorEntry*>::iterator next = i; + if (++next == children.end()) { + // show additional wires if outputs of last processor are not an identity map. + if ((*i)->routing_icon.out_identity ()) { + (*i)->output_routing_icon.hide(); + } else { + (*i)->output_routing_icon.copy_state ((*i)->routing_icon); + (*i)->output_routing_icon.show(); + } + } else { + (*i)->output_routing_icon.hide(); + } } - // TODO show additional wires if outputs of last processor are not an identity map. } void diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h index 663f82b53c..8336864a6c 100644 --- a/gtk2_ardour/processor_box.h +++ b/gtk2_ardour/processor_box.h @@ -283,7 +283,7 @@ private: class RoutingIcon : public Gtk::DrawingArea { public: - RoutingIcon(); + RoutingIcon(bool inputrouting = true); void set ( const ARDOUR::ChanCount&, const ARDOUR::ChanCount&, @@ -295,17 +295,34 @@ private: const ARDOUR::ChanCount&, const ARDOUR::ChanCount&, const ARDOUR::ChanMapping&); + + void copy_state (const RoutingIcon& other) { + _in = other._in; + _out = other._out; + _sources = other._sources; + _sinks = other._sinks; + _in_map = other._in_map; + _out_map = other._out_map; + _f_out = other._f_out; + _f_out_map = other._f_out_map; + _f_sources = other._f_sources; + _feed = other._feed; + } + void unset_feed () { _feed = false ; } bool identity () const; + bool out_identity () const; static double pin_x_pos (uint32_t, double, uint32_t, uint32_t, bool); static void draw_connection (cairo_t*, double, double, double, double, bool, bool dashed = false); static void draw_gnd (cairo_t*, double, double, bool); + static void draw_X (cairo_t*, double, double, bool); static void draw_sidechain (cairo_t*, double, double, bool); private: bool on_expose_event (GdkEventExpose *); - void expose_map (cairo_t*, const double, const double); + void expose_input_map (cairo_t*, const double, const double); + void expose_output_map (cairo_t*, const double, const double); ARDOUR::ChanCount _in; ARDOUR::ChanCount _out; @@ -317,12 +334,14 @@ private: ARDOUR::ChanMapping _f_out_map; ARDOUR::ChanCount _f_sources; bool _feed; + bool _input; }; public: - RoutingIcon routing_icon; PortIcon input_icon; PortIcon output_icon; + RoutingIcon routing_icon; // sits on top of every processor (input routing) + RoutingIcon output_routing_icon; // only used by last processor in the chain protected: PluginDisplay *_plugin_display ; |