From c4838f5d87c188c1c9828673b22896d87183d8b0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 27 Jul 2023 13:28:51 -0600 Subject: [PATCH] remove RouteGroup method from RouteUI::maybe_use_select_as_group() No longer necessary, after logic change. --- gtk2_ardour/route_ui.cc | 8 ++++---- gtk2_ardour/route_ui.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 2895340f42..3dcef3216a 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -566,7 +566,7 @@ RouteUI::mute_press (GdkEventButton* ev) Controllable::GroupControlDisposition gcd; std::shared_ptr rl (new RouteList); - if (maybe_use_select_as_group (&RouteGroup::is_mute)) { + if (maybe_use_select_as_group ()) { gather_selected_routes (rl); gcd = Controllable::NoGroup; } else { @@ -745,7 +745,7 @@ RouteUI::solo_press(GdkEventButton* ev) std::shared_ptr rl (new RouteList); Controllable::GroupControlDisposition gcd; - if (maybe_use_select_as_group (&RouteGroup::is_solo)) { + if (maybe_use_select_as_group ()) { gather_selected_routes (rl); gcd = Controllable::NoGroup; } else { @@ -842,7 +842,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev) Controllable::GroupControlDisposition gcd; rl.reset (new RouteList); - if (maybe_use_select_as_group (&RouteGroup::is_recenable)) { + if (maybe_use_select_as_group ()) { gather_selected_routes (rl); gcd = Controllable::NoGroup; } else { @@ -2884,7 +2884,7 @@ RouteUI::rename_current_playlist () } bool -RouteUI::maybe_use_select_as_group (bool (RouteGroup::*method)() const) const +RouteUI::maybe_use_select_as_group () const { if (!UIConfiguration::instance().get_allow_selection_as_group()) { return false; diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index c16a21f37f..1d11d259ca 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -263,7 +263,7 @@ protected: ARDOUR::SoloMuteRelease* _solo_release; ARDOUR::SoloMuteRelease* _mute_release; - bool maybe_use_select_as_group (bool (ARDOUR::RouteGroup::*method)() const) const; + bool maybe_use_select_as_group () const; void gather_selected_routes (std::shared_ptr& rl) const; private: