From 8bb76f2a65b45dc15b8d6f684f4d6c75c94fae91 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 2 Nov 2020 15:52:42 +0100 Subject: [PATCH] NO-OP: code-reorder to facility Mixbus LAN button layout --- gtk2_ardour/mixer_strip.cc | 52 ++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index cf84809919..84ec964af6 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -601,30 +601,6 @@ MixerStrip::set_route (boost::shared_ptr rt) master_volume_table.show (); } - if (_volume_controller == 0) { - assert (_loudess_analysis_button == 0); - assert (route()->volume_control()); - boost::shared_ptr ac = route()->volume_control (); - - _volume_controller = AutomationController::create (ac->parameter (), ParameterDescriptor (ac->parameter ()), ac, false); - _volume_controller->set_name (X_("ProcessorControlSlider")); - _volume_controller->set_size_request (PX_SCALE(19), -1); - _volume_controller->disable_vertical_scroll (); - - _loudess_analysis_button = manage (new ArdourButton (S_("Loudness|LAN"))); - _loudess_analysis_button->signal_clicked.connect (mem_fun (*this, &MixerStrip::loudess_analysis_button_clicked)); - _volume_controller->signal_button_press_event().connect (mem_fun (*this, &MixerStrip::volume_controller_button_pressed), false); - - set_tooltip (*_volume_controller, _("Master output volume")); - set_tooltip (_loudess_analysis_button, _("Measure loudness of the session, normalize master output volume")); - - master_volume_table.attach (*_loudess_analysis_button, 0, 2, 0, 1); - master_volume_table.attach (*_volume_controller, 0, 2, 1, 2); - - _loudess_analysis_button->show (); - _volume_controller->show (); - } - if (monitor_section_button == 0 && _mixer_owned) { Glib::RefPtr act = ActionManager::get_action ("Mixer", "ToggleMonitorSection"); _session->MonitorChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::monitor_changed, this), gui_context()); @@ -646,6 +622,34 @@ MixerStrip::set_route (boost::shared_ptr rt) master_volume_table.hide (); } + if (route()->is_master() && _volume_controller == 0) { + assert (_loudess_analysis_button == 0); + assert (route()->volume_control()); + boost::shared_ptr ac = route()->volume_control (); + + _volume_controller = AutomationController::create (ac->parameter (), ParameterDescriptor (ac->parameter ()), ac, false); + _volume_controller->set_name (X_("ProcessorControlSlider")); + _volume_controller->set_size_request (PX_SCALE(19), -1); + _volume_controller->disable_vertical_scroll (); + + _loudess_analysis_button = manage (new ArdourButton (S_("Loudness|LAN"))); + _loudess_analysis_button->signal_clicked.connect (mem_fun (*this, &MixerStrip::loudess_analysis_button_clicked)); + _volume_controller->signal_button_press_event().connect (mem_fun (*this, &MixerStrip::volume_controller_button_pressed), false); + + set_tooltip (*_volume_controller, _("Master output volume")); + set_tooltip (_loudess_analysis_button, _("Measure loudness of the session, normalize master output volume")); + + master_volume_table.attach (*_loudess_analysis_button, 0, 2, 0, 1); + master_volume_table.attach (*_volume_controller, 0, 2, 1, 2); + + _loudess_analysis_button->show (); + _volume_controller->show (); +#ifdef MIXBUS + } else if (!route()->is_master()) { + master_volume_table.hide (); +#endif + } + hide_master_spacer (false); if (is_track()) {