X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fgain_control.cc;h=1813586e0935a49cf8e2aa177f9311f3a7a853df;hb=4e5423b3487771220cdca4c2b1a79c4d74b6afa5;hp=9314e1270eed102a920ba8398739ae1e8760d370;hpb=55094b723774086d0f54d688b1ca73a4df82b93e;p=ardour.git

diff --git a/libs/ardour/gain_control.cc b/libs/ardour/gain_control.cc
index 9314e1270e..1813586e09 100644
--- a/libs/ardour/gain_control.cc
+++ b/libs/ardour/gain_control.cc
@@ -16,77 +16,66 @@
     675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <cmath>
+
+#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"
+#include "ardour/vca.h"
+#include "ardour/vca_manager.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;
 
 GainControl::GainControl (Session& session, const Evoral::Parameter &param, boost::shared_ptr<AutomationList> al)
-	: AutomationControl (session, param, ParameterDescriptor(param),
-	                     al ? al : boost::shared_ptr<AutomationList> (new AutomationList (param)),
-	                     param.type() == GainAutomation ? X_("gaincontrol") : X_("trimcontrol")) {
-
-	alist()->reset_default (1.0);
-
-	lower_db = accurate_coefficient_to_dB (_desc.lower);
-	range_db = accurate_coefficient_to_dB (_desc.upper) - lower_db;
-}
-
-void
-GainControl::set_value (double val, PBD::Controllable::GroupControlDisposition /* group_override */)
+	: SlavableAutomationControl (session, param, ParameterDescriptor(param),
+	                             al ? al : boost::shared_ptr<AutomationList> (new AutomationList (param)),
+	                             param.type() == GainAutomation ? X_("gaincontrol") : X_("trimcontrol"),
+	                             Controllable::GainLike)
 {
-	if (writable()) {
-		set_value_unchecked (val);
-	}
 }
 
 void
-GainControl::set_value_unchecked (double val)
+GainControl::inc_gain (gain_t factor)
 {
-	AutomationControl::set_value (std::max (std::min (val, (double)_desc.upper), (double)_desc.lower), Controllable::NoGroup);
-	_session.set_dirty ();
-}
+	/* To be used ONLY when doing group-relative gain adjustment, from
+	 * ControlGroup::set_group_values().
+	 */
 
-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;
-	}
-}
+	const float desired_gain = get_value ();
 
-double
-GainControl::interface_to_internal (double v) const
-{
-	if (_desc.type == GainAutomation) {
-		return slider_position_to_gain (v);
+	if (fabsf (desired_gain) < GAIN_COEFF_SMALL) {
+		// really?! what's the idea here?
+		actually_set_value (0.000001f + (0.000001f * factor), Controllable::ForGroup);
 	} else {
-		return dB_to_coefficient (lower_db + v * range_db);
+		actually_set_value (desired_gain + (desired_gain * factor), Controllable::ForGroup);
 	}
 }
 
-double
-GainControl::internal_to_user (double v) const
-{
-	return accurate_coefficient_to_dB (v);
-}
-
-double
-GainControl::user_to_internal (double u) const
+void
+GainControl::post_add_master (boost::shared_ptr<AutomationControl> m)
 {
-	return dB_to_coefficient (u);
+	if (m->get_value() == 0) {
+		/* master is at -inf, which forces this ctrl to -inf on assignment */
+		Changed (false, Controllable::NoGroup); /* EMIT SIGNAL */
+	}
 }
 
-std::string
-GainControl::get_user_string () const
+bool
+GainControl::get_masters_curve_locked (samplepos_t start, samplepos_t end, float* vec, samplecnt_t veclen) const
 {
-	char theBuf[32]; sprintf( theBuf, _("%3.1f dB"), accurate_coefficient_to_dB (get_value()));
-	return std::string(theBuf);
+	if (_masters.empty()) {
+		return list()->curve().rt_safe_get_vector (start, end, vec, veclen);
+	}
+	for (samplecnt_t i = 0; i < veclen; ++i) {
+		vec[i] = 1.f;
+	}
+	return SlavableAutomationControl::masters_curve_multiply (start, end, vec, veclen);
 }
-