diff --git a/gtk2_ardour/trigger_strip.cc b/gtk2_ardour/trigger_strip.cc index f246215cfd..7f005e9553 100644 --- a/gtk2_ardour/trigger_strip.cc +++ b/gtk2_ardour/trigger_strip.cc @@ -64,6 +64,8 @@ TriggerStrip::TriggerStrip (Session* s, std::shared_ptr rt) , _clear_meters (true) , _pb_selection () , _tmaster_widget (-1, 16) + , input_button (true) + , output_button (false) , _processor_box (s, boost::bind (&TriggerStrip::plugin_selector, this), _pb_selection, 0) , _trigger_display (*this, -1., TriggerBox::default_triggers_per_box * 16.) , _panners (s) @@ -132,6 +134,7 @@ TriggerStrip::init () /* strip layout */ global_vpacker.set_spacing (2); + global_vpacker.pack_start (input_button, Gtk::PACK_SHRINK); global_vpacker.pack_start (_name_button, Gtk::PACK_SHRINK); global_vpacker.pack_start (_trigger_display, Gtk::PACK_SHRINK); global_vpacker.pack_start (_tmaster_widget, Gtk::PACK_SHRINK); @@ -139,12 +142,14 @@ TriggerStrip::init () global_vpacker.pack_start (_panners, Gtk::PACK_SHRINK); global_vpacker.pack_start (mute_solo_table, Gtk::PACK_SHRINK); global_vpacker.pack_start (volume_table, Gtk::PACK_SHRINK); + global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK); /* Mute & Solo */ mute_solo_table.set_homogeneous (true); mute_solo_table.set_spacings (2); mute_solo_table.attach (*mute_button, 0, 1, 0, 1); mute_solo_table.attach (*solo_button, 1, 2, 0, 1); + mute_solo_table.attach (*rec_enable_button, 0, 2, 1, 2); volume_table.attach (_level_meter, 0, 1, 0, 1); /*Note: _gain_control is added in set_route */ @@ -177,6 +182,8 @@ TriggerStrip::init () volume_table.show (); global_frame.show (); global_vpacker.show (); + input_button.show_all (); + output_button.show_all (); show (); /* Width -- wide channel strip @@ -195,6 +202,9 @@ TriggerStrip::set_route (std::shared_ptr rt) _tmaster->set_triggerbox(_route->triggerbox ()); + input_button.set_route (route (), this); + output_button.set_route (route (), this); + _processor_box.set_route (rt); /* Fader/Gain */ diff --git a/gtk2_ardour/trigger_strip.h b/gtk2_ardour/trigger_strip.h index 15d01591b1..cf0694aafe 100644 --- a/gtk2_ardour/trigger_strip.h +++ b/gtk2_ardour/trigger_strip.h @@ -33,6 +33,7 @@ #include "automation_controller.h" #include "axis_view.h" #include "fitted_canvas_widget.h" +#include "io_button.h" #include "level_meter.h" #include "panner_ui.h" #include "processor_box.h" @@ -125,6 +126,8 @@ private: FittedCanvasWidget _tmaster_widget; TriggerMaster* _tmaster; + IOButton input_button; + IOButton output_button; ArdourWidgets::ArdourButton _name_button; ProcessorBox _processor_box; TriggerBoxWidget _trigger_display;