diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 18 | ||||
| -rw-r--r-- | libs/ardour/ardour/profile.h | 4 |
4 files changed, 22 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index c87c78d58e..0191c08700 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -4305,6 +4305,10 @@ ARDOUR_UI::setup_profile () if (g_getenv ("TRX")) { Profile->set_trx (); } + + if (g_getenv ("MIXBUS")) { + Profile->set_mixbus (); + } } int diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 53efcbb48b..ad8336ca10 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -223,7 +223,7 @@ ARDOUR_UI::setup_transport () transport_tearoff->set_name ("TransportBase"); transport_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()), false); - if (Profile->get_sae()) { + if (Profile->get_sae() || Profile->get_mixbus()) { transport_tearoff->set_can_be_torn_off (false); } diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 73686966fe..4727943287 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2825,7 +2825,7 @@ Editor::setup_toolbar () _mouse_mode_tearoff->set_name ("MouseModeBase"); _mouse_mode_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &_mouse_mode_tearoff->tearoff_window()), false); - if (Profile->get_sae()) { + if (Profile->get_sae() || Profile->get_mixbus() ) { _mouse_mode_tearoff->set_can_be_torn_off (false); } @@ -2870,14 +2870,18 @@ Editor::setup_toolbar () set_size_request_to_display_given_text (zoom_focus_selector, _("Edit Point"), 30, 2); // zoom_focus_selector.add_elements (ArdourButton::Inset); - if (!ARDOUR::Profile->get_trx()) { + if (ARDOUR::Profile->get_mixbus()) { _zoom_box.pack_start (zoom_out_button, false, false); _zoom_box.pack_start (zoom_in_button, false, false); _zoom_box.pack_start (zoom_out_full_button, false, false); - _zoom_box.pack_start (zoom_focus_selector, false, false); - } else { + } else if (ARDOUR::Profile->get_trx()) { mode_box->pack_start (zoom_out_button, false, false); mode_box->pack_start (zoom_in_button, false, false); + } else { + _zoom_box.pack_start (zoom_out_button, false, false); + _zoom_box.pack_start (zoom_in_button, false, false); + _zoom_box.pack_start (zoom_out_full_button, false, false); + _zoom_box.pack_start (zoom_focus_selector, false, false); } /* Track zoom buttons */ @@ -2920,6 +2924,10 @@ Editor::setup_toolbar () &_zoom_tearoff->tearoff_window(), 0)); } + if (Profile->get_sae() || Profile->get_mixbus() ) { + _zoom_tearoff->set_can_be_torn_off (false); + } + snap_box.set_spacing (2); snap_box.set_border_width (2); @@ -2965,7 +2973,7 @@ Editor::setup_toolbar () _tools_tearoff->set_name ("MouseModeBase"); _tools_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &_tools_tearoff->tearoff_window()), false); - if (Profile->get_sae()) { + if (Profile->get_sae() || Profile->get_mixbus()) { _tools_tearoff->set_can_be_torn_off (false); } diff --git a/libs/ardour/ardour/profile.h b/libs/ardour/ardour/profile.h index 56d9ff62be..1ea7e2b036 100644 --- a/libs/ardour/ardour/profile.h +++ b/libs/ardour/ardour/profile.h @@ -34,6 +34,7 @@ public: SAE, SinglePackage, Trx, + Mixbus, LastElement, }; @@ -49,6 +50,9 @@ public: bool get_trx() const { return bits[Trx]; } void set_trx() { bits[Trx] = true; } + bool get_mixbus() const { return bits[Mixbus]; } + void set_mixbus() { bits[Mixbus] = true; } + void set_single_package () { bits[SinglePackage] = true; } bool get_single_package () const { return bits[SinglePackage]; } |