From 80c3bd15e60e06343cf05dadfe94ae5e64ac57d7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 14 May 2024 12:28:40 -0600 Subject: [PATCH] revert "show send" changes to mixer strip --- gtk2_ardour/mixer_strip.cc | 90 +++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 51 deletions(-) diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index f0f89b347d..5403dc4a95 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -606,11 +606,7 @@ MixerStrip::set_route (std::shared_ptr rt) */ processor_box.set_route (rt); - if (Profile->get_livetrax() && !rt->is_master()) { - show_send (_route->master_send()); - } else { - revert_to_default_display (); - } + revert_to_default_display (); /* unpack these from the parent and stuff them into our own table @@ -1524,54 +1520,46 @@ MixerStrip::hide_processor_editor (std::weak_ptr p) void MixerStrip::reset_strip_style () { - if (!Profile->get_livetrax() && _current_delivery && std::dynamic_pointer_cast(_current_delivery)) { - - gpm.unset_fader_fg (); - gpm.set_fader_name ("SendStripBase"); - - } else { - - if (is_midi_track()) { - if (_route->active()) { - set_name ("MidiTrackStripBase"); - } else { - set_name ("MidiTrackStripBaseInactive"); - } - if (UIConfiguration::instance().get_use_route_color_widely()) { - // gpm.set_fader_bg (); - gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint())); - } else { - gpm.unset_fader_fg (); - } - gpm.set_fader_name ("MidiTrackFader"); - } else if (is_audio_track()) { - if (_route->active()) { - set_name ("AudioTrackStripBase"); - } else { - set_name ("AudioTrackStripBaseInactive"); - } - if (UIConfiguration::instance().get_use_route_color_widely()) { - // gpm.set_fader_bg (); - gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint())); - } else { - gpm.unset_fader_fg (); - } - gpm.set_fader_name ("AudioTrackFader"); + if (is_midi_track()) { + if (_route->active()) { + set_name ("MidiTrackStripBase"); } else { - if (_route->active()) { - set_name ("AudioBusStripBase"); - } else { - set_name ("AudioBusStripBaseInactive"); - } - - if (!is_master() && UIConfiguration::instance().get_use_route_color_widely()) { - // gpm.set_fader_bg (); - gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint())); - } else { - gpm.unset_fader_fg (); - } - gpm.set_fader_name ("AudioBusFader"); + set_name ("MidiTrackStripBaseInactive"); } + if (UIConfiguration::instance().get_use_route_color_widely()) { + // gpm.set_fader_bg (); + gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint())); + } else { + gpm.unset_fader_fg (); + } + gpm.set_fader_name ("MidiTrackFader"); + } else if (is_audio_track()) { + if (_route->active()) { + set_name ("AudioTrackStripBase"); + } else { + set_name ("AudioTrackStripBaseInactive"); + } + if (UIConfiguration::instance().get_use_route_color_widely()) { + // gpm.set_fader_bg (); + gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint())); + } else { + gpm.unset_fader_fg (); + } + gpm.set_fader_name ("AudioTrackFader"); + } else { + if (_route->active()) { + set_name ("AudioBusStripBase"); + } else { + set_name ("AudioBusStripBaseInactive"); + } + + if (!is_master() && UIConfiguration::instance().get_use_route_color_widely()) { + // gpm.set_fader_bg (); + gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint())); + } else { + gpm.unset_fader_fg (); + } + gpm.set_fader_name ("AudioBusFader"); } }