ardour
/
livetrax
13
0
Fork 0
Code

L: expose Output button at bottom of master strip (only)

This commit is contained in:
Ben Loftis 2024-05-07 20:35:28 -05:00
parent e276fd08fd
commit a76f5db57f
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/io_button.cc
View File

@ -672,7 +672,7 @@ IOButton::button_press (GdkEventButton* ev)
citems.push_back (SeparatorElem ()); citems.push_back (SeparatorElem ());
} }
if (_input || !ARDOUR::Profile->get_mixbus ()) { if ((_input || !ARDOUR::Profile->get_mixbus ()) && !ARDOUR::Profile->get_livetrax ()) {
bool need_separator = false; bool need_separator = false;
for (DataType::iterator i = DataType::begin (); i != DataType::end (); ++i) { for (DataType::iterator i = DataType::begin (); i != DataType::end (); ++i) {
if (!io ()->can_add_port (*i)) { if (!io ()->can_add_port (*i)) {

12
gtk2_ardour/mixer_strip.cc
View File

@ -353,6 +353,7 @@ MixerStrip::init ()
global_vpacker.pack_start (panners, Gtk::PACK_SHRINK); global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
global_vpacker.pack_start (mute_solo_table, 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 (gpm, Gtk::PACK_SHRINK);
global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
} }
#ifndef MIXBUS #ifndef MIXBUS
@ -370,9 +371,13 @@ MixerStrip::init ()
scrollbar_height = requisition.height; scrollbar_height = requisition.height;
scrollbar_height += 3; // track_display_frame border/shadow scrollbar_height += 3; // track_display_frame border/shadow
} }
#ifndef LIVETRAX
spacer.set_size_request (-1, scrollbar_height); spacer.set_size_request (-1, scrollbar_height);
spacer.set_name ("AudioBusStripBase"); spacer.set_name ("AudioBusStripBase");
global_vpacker.pack_end (spacer, false, false); global_vpacker.pack_end (spacer, false, false);
#else
output_button.set_size_request (-1, scrollbar_height);
#endif
#endif #endif
global_frame.add (global_vpacker); global_frame.add (global_vpacker);
@ -834,7 +839,14 @@ MixerStrip::set_route (std::shared_ptr<Route> rt)
gpm.show_all (); gpm.show_all ();
gpm.meter_point_button.show(); gpm.meter_point_button.show();
input_button_box.show_all(); input_button_box.show_all();
#ifndef LIVETRAX
output_button.show(); 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(); name_button.show();
_comment_button.show(); _comment_button.show();
group_button.show(); group_button.show();

4
gtk2_ardour/port_matrix.cc
View File

@ -432,6 +432,10 @@ PortMatrix::visible_rows () const
void void
PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t) PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t)
{ {
#ifdef LIVETRAX
return;
#endif
using namespace Menu_Helpers; using namespace Menu_Helpers;
delete _menu; delete _menu;