From ca551ed07aeb2f27cc078527615c0f4ecfb9fdda Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Fri, 10 May 2024 17:37:28 -0600
Subject: [PATCH] add the correct control to a ControlGroup when adding a Route
 to a RouteGroup

---
 libs/ardour/route_group.cc | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc
index 99e60cce73..84f123a4bb 100644
--- a/libs/ardour/route_group.cc
+++ b/libs/ardour/route_group.cc
@@ -33,9 +33,11 @@
 #include "ardour/amp.h"
 #include "ardour/audio_track.h"
 #include "ardour/debug.h"
+#include "ardour/internal_send.h"
 #include "ardour/monitor_control.h"
 #include "ardour/route.h"
 #include "ardour/route_group.h"
+#include "ardour/profile.h"
 #include "ardour/session.h"
 #include "ardour/surround_send.h"
 #include "ardour/vca.h"
@@ -187,7 +189,11 @@ RouteGroup::add (std::shared_ptr<Route> r)
 
 	_solo_group->add_control (r->solo_control());
 	_mute_group->add_control (r->mute_control());
-	_gain_group->add_control (r->gain_control());
+	if (ARDOUR::Profile->get_livetrax()) {
+		_gain_group->add_control (r->master_send()->gain_control());
+	} else {
+		_gain_group->add_control (r->gain_control());
+	}
 	std::shared_ptr<Track> trk = std::dynamic_pointer_cast<Track> (r);
 	if (trk) {
 		_rec_enable_group->add_control (trk->rec_enable_control());
@@ -258,7 +264,11 @@ RouteGroup::remove (std::shared_ptr<Route> r)
 
 		_solo_group->remove_control (r->solo_control());
 		_mute_group->remove_control (r->mute_control());
-		_gain_group->remove_control (r->gain_control());
+		if (Profile->get_livetrax()) {
+			_gain_group->remove_control (r->master_send()->gain_control());
+		} else {
+			_gain_group->remove_control (r->gain_control());
+		}
 		std::shared_ptr<Track> trk = std::dynamic_pointer_cast<Track> (r);
 		if (trk) {
 			_rec_enable_group->remove_control (trk->rec_enable_control());