From ec8a4de01596c162c1529f3021dfc432bf66dfe8 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Fri, 10 Jun 2016 16:59:27 -0400
Subject: make relative gain control in route groups work (again)

---
 libs/ardour/control_group.cc | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

(limited to 'libs/ardour/control_group.cc')

diff --git a/libs/ardour/control_group.cc b/libs/ardour/control_group.cc
index 25f21a8775..51a1515c6a 100644
--- a/libs/ardour/control_group.cc
+++ b/libs/ardour/control_group.cc
@@ -46,6 +46,12 @@ ControlGroup::set_active (bool yn)
 	_active = yn;
 }
 
+void
+ControlGroup::set_mode (Mode m)
+{
+	_mode = m;
+}
+
 void
 ControlGroup::clear ()
 {
@@ -185,6 +191,11 @@ ControlGroup::set_group_value (boost::shared_ptr<AutomationControl> control, dou
 
 /*---- GAIN CONTROL GROUP -----------*/
 
+GainControlGroup::GainControlGroup ()
+	: ControlGroup (GainAutomation)
+{
+}
+
 gain_t
 GainControlGroup::get_min_factor (gain_t factor)
 {
@@ -235,13 +246,9 @@ GainControlGroup::get_max_factor (gain_t factor)
 void
 GainControlGroup::set_group_value (boost::shared_ptr<AutomationControl> control, double val)
 {
-	/* set the primary control */
-
-	control->set_value (val, Controllable::ForGroup);
-
-	/* now propagate across the group */
-
 	if (!_active) {
+		/* set the primary control */
+		control->set_value (val, Controllable::ForGroup);
 		return;
 	}
 
@@ -262,8 +269,9 @@ GainControlGroup::set_group_value (boost::shared_ptr<AutomationControl> control,
 
 		delta -= usable_gain;
 
-		if (delta == 0.0f)
+		if (delta == 0.0f) {
 			return;
+		}
 
 		gain_t factor = delta / usable_gain;
 
@@ -281,6 +289,12 @@ GainControlGroup::set_group_value (boost::shared_ptr<AutomationControl> control,
 			}
 		}
 
+		/* set the primary control */
+
+		control->set_value (val, Controllable::ForGroup);
+
+		/* now propagate across the group */
+
 		for (ControlMap::iterator c = _controls.begin(); c != _controls.end(); ++c) {
 			if (c->second == control) {
 				continue;
@@ -295,10 +309,10 @@ GainControlGroup::set_group_value (boost::shared_ptr<AutomationControl> control,
 
 	} else {
 
+		/* just set entire group */
+
 		for (ControlMap::iterator c = _controls.begin(); c != _controls.end(); ++c) {
-			if (c->second != control) {
-				c->second->set_value (val, Controllable::ForGroup);
-			}
+			c->second->set_value (val, Controllable::ForGroup);
 		}
 	}
 }
-- 
cgit v1.2.3