diff --git a/gtk2_ardour/io_button.cc b/gtk2_ardour/io_button.cc index 3f153d1683..d77c26d466 100644 --- a/gtk2_ardour/io_button.cc +++ b/gtk2_ardour/io_button.cc @@ -672,7 +672,7 @@ IOButton::button_press (GdkEventButton* ev) citems.push_back (SeparatorElem ()); } - if (_input || !ARDOUR::Profile->get_mixbus ()) { + if ((_input || !ARDOUR::Profile->get_mixbus ()) && !ARDOUR::Profile->get_livetrax ()) { bool need_separator = false; for (DataType::iterator i = DataType::begin (); i != DataType::end (); ++i) { if (!io ()->can_add_port (*i)) { diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index a4bce820a1..f0f89b347d 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -353,6 +353,7 @@ MixerStrip::init () global_vpacker.pack_start (panners, Gtk::PACK_SHRINK); global_vpacker.pack_start (mute_solo_table, Gtk::PACK_SHRINK); global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK); + global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK); } #ifndef MIXBUS @@ -370,9 +371,13 @@ MixerStrip::init () scrollbar_height = requisition.height; scrollbar_height += 3; // track_display_frame border/shadow } +#ifndef LIVETRAX spacer.set_size_request (-1, scrollbar_height); spacer.set_name ("AudioBusStripBase"); global_vpacker.pack_end (spacer, false, false); +#else + output_button.set_size_request (-1, scrollbar_height); +#endif #endif global_frame.add (global_vpacker); @@ -834,7 +839,14 @@ MixerStrip::set_route (std::shared_ptr rt) gpm.show_all (); gpm.meter_point_button.show(); input_button_box.show_all(); +#ifndef LIVETRAX output_button.show(); +#else + if (!_route->is_master()) { + //we can't just hide it, apparently there's a show_all somewhere + global_vpacker.remove(output_button); + } +#endif name_button.show(); _comment_button.show(); group_button.show(); diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc index 020b2a3278..4c52987763 100644 --- a/gtk2_ardour/port_matrix.cc +++ b/gtk2_ardour/port_matrix.cc @@ -432,6 +432,10 @@ PortMatrix::visible_rows () const void PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t) { +#ifdef LIVETRAX + return; +#endif + using namespace Menu_Helpers; delete _menu;