X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fgain_control.cc;h=1813586e0935a49cf8e2aa177f9311f3a7a853df;hb=5fa05b403ca21a6573d07b921dc14f0769dc9fc7;hp=d100273640087e372f75dde70bf7b39bfba3c79e;hpb=c21332df7146008f359ae52918f2695b39c6b3b8;p=ardour.git

diff --git a/libs/ardour/gain_control.cc b/libs/ardour/gain_control.cc
index d100273640..1813586e09 100644
--- a/libs/ardour/gain_control.cc
+++ b/libs/ardour/gain_control.cc
@@ -21,6 +21,8 @@
 #include "pbd/convert.h"
 #include "pbd/strsplit.h"
 
+#include "evoral/Curve.hpp"
+
 #include "ardour/dB.h"
 #include "ardour/gain_control.h"
 #include "ardour/session.h"
@@ -38,49 +40,6 @@ GainControl::GainControl (Session& session, const Evoral::Parameter &param, boos
 	                             param.type() == GainAutomation ? X_("gaincontrol") : X_("trimcontrol"),
 	                             Controllable::GainLike)
 {
-	alist()->reset_default (1.0);
-
-	lower_db = accurate_coefficient_to_dB (_desc.lower);
-	range_db = accurate_coefficient_to_dB (_desc.upper) - lower_db;
-}
-
-double
-GainControl::internal_to_interface (double v) const
-{
-	if (_desc.type == GainAutomation) {
-		return gain_to_slider_position (v);
-	} else {
-		return (accurate_coefficient_to_dB (v) - lower_db) / range_db;
-	}
-}
-
-double
-GainControl::interface_to_internal (double v) const
-{
-	if (_desc.type == GainAutomation) {
-		return slider_position_to_gain (v);
-	} else {
-		return dB_to_coefficient (lower_db + v * range_db);
-	}
-}
-
-double
-GainControl::internal_to_user (double v) const
-{
-	return accurate_coefficient_to_dB (v);
-}
-
-double
-GainControl::user_to_internal (double u) const
-{
-	return dB_to_coefficient (u);
-}
-
-std::string
-GainControl::get_user_string () const
-{
-	char theBuf[32]; sprintf( theBuf, _("%3.1f dB"), accurate_coefficient_to_dB (get_value()));
-	return std::string(theBuf);
 }
 
 void
@@ -90,7 +49,7 @@ GainControl::inc_gain (gain_t factor)
 	 * ControlGroup::set_group_values().
 	 */
 
-	const float desired_gain = user_double();
+	const float desired_gain = get_value ();
 
 	if (fabsf (desired_gain) < GAIN_COEFF_SMALL) {
 		// really?! what's the idea here?
@@ -101,84 +60,22 @@ GainControl::inc_gain (gain_t factor)
 }
 
 void
-GainControl::recompute_masters_ratios (double val)
+GainControl::post_add_master (boost::shared_ptr<AutomationControl> m)
 {
-	/* Master WRITE lock must be held */
-
-	/* V' is the new gain value for this
-
-	   Mv(n) is the return value of ::get_value() for the n-th master
-	   Mr(n) is the return value of ::ratio() for the n-th master record
-
-	   the slave should return V' on the next call to ::get_value().
-
-	   but the value is determined by the masters, so we know:
-
-	   V' = (Mv(1) * Mr(1)) * (Mv(2) * Mr(2)) * ... * (Mv(n) * Mr(n))
-
-	   hence:
-
-	   Mr(1) * Mr(2) * ... * (Mr(n) = V' / (Mv(1) * Mv(2) * ... * Mv(n))
-
-	   if we make all ratios equal (i.e. each master contributes the same
-	   fraction of its own gain level to make the final slave gain), then we
-	   have:
-
-	   pow (Mr(n), n) = V' / (Mv(1) * Mv(2) * ... * Mv(n))
-
-	   which gives
-
-	   Mr(n) = pow ((V' / (Mv(1) * Mv(2) * ... * Mv(n))), 1/n)
-
-	   Mr(n) is the new ratio number for the slaves
-	*/
-
-
-	const double nmasters = _masters.size();
-	double masters_total_gain_coefficient = 1.0;
-
-	for (Masters::iterator mr = _masters.begin(); mr != _masters.end(); ++mr) {
-		masters_total_gain_coefficient *= mr->second.master()->get_value();
-	}
-
-	const double new_universal_ratio = pow ((val / masters_total_gain_coefficient), (1.0/nmasters));
-
-	for (Masters::iterator mr = _masters.begin(); mr != _masters.end(); ++mr) {
-		mr->second.reset_ratio (new_universal_ratio);
+	if (m->get_value() == 0) {
+		/* master is at -inf, which forces this ctrl to -inf on assignment */
+		Changed (false, Controllable::NoGroup); /* EMIT SIGNAL */
 	}
 }
 
-XMLNode&
-GainControl::get_state ()
+bool
+GainControl::get_masters_curve_locked (samplepos_t start, samplepos_t end, float* vec, samplecnt_t veclen) const
 {
-	XMLNode& node (AutomationControl::get_state());
-
-#if 0
-	/* store VCA master IDs */
-
-	string str;
-
-	{
-		Glib::Threads::RWLock::ReaderLock lm (master_lock);
-		for (Masters::const_iterator mr = _masters.begin(); mr != _masters.end(); ++mr) {
-			if (!str.empty()) {
-				str += ',';
-			}
-			str += PBD::to_string (mr->first, std::dec);
-		}
+	if (_masters.empty()) {
+		return list()->curve().rt_safe_get_vector (start, end, vec, veclen);
 	}
-
-	if (!str.empty()) {
-		node.add_property (X_("masters"), str);
+	for (samplecnt_t i = 0; i < veclen; ++i) {
+		vec[i] = 1.f;
 	}
-#endif
-
-	return node;
-}
-
-int
-GainControl::set_state (XMLNode const& node, int version)
-{
-	return AutomationControl::set_state (node, version);
+	return SlavableAutomationControl::masters_curve_multiply (start, end, vec, veclen);
 }
-