make sure that fade in and fade out curves reach their target (1.0 and 0.0) rather...

[ardour.git] / libs / ardour / amp.cc

diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc
index 36d0c6bf331c08ea68ccb9ede9a8a8bfb8fd7743..5f305182f8c8472a1fbd7160e943b4b93ec7d739 100644 (file)
--- a/libs/ardour/amp.cc
+++ b/libs/ardour/amp.cc
@@ -34,6 +34,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 
 Amp::Amp (Session& s)
        : Processor(s, "Amp")
@@ -70,7 +71,7 @@ Amp::configure_io (ChanCount in, ChanCount out)
 }
 
 void
-Amp::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t nframes, bool)
+Amp::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, pframes_t nframes, bool)
 {
        if (!_active && !_pending_active) {
                return;
@@ -84,7 +85,7 @@ Amp::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, n
 
                        for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) {
                                Sample* const sp = i->data();
-                               for (nframes_t nx = 0; nx < nframes; ++nx) {
+                               for (pframes_t nx = 0; nx < nframes; ++nx) {
                                        sp[nx] *= gab[nx];
                                }
                        }
@@ -93,7 +94,7 @@ Amp::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, n
 
                } else { /* manual (scalar) gain */
 
-                       gain_t const dg = _gain_control->user_float();
+                       gain_t const dg = _gain_control->user_double();
 
                        if (_current_gain != dg) {
 
@@ -128,7 +129,7 @@ Amp::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, n
 }
 
 void
-Amp::apply_gain (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t target)
+Amp::apply_gain (BufferSet& bufs, framecnt_t nframes, gain_t initial, gain_t target)
 {
         /** Apply a (potentially) declicked gain to the buffers of @a bufs
         */
@@ -143,7 +144,7 @@ Amp::apply_gain (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t targ
                return;
        }
 
-       const nframes_t declick = std::min ((nframes_t)128, nframes);
+       const framecnt_t declick = std::min ((framecnt_t) 128, nframes);
        gain_t         delta;
        double         fractional_shift = -1.0/declick;
        double         fractional_pos;
@@ -179,7 +180,7 @@ Amp::apply_gain (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t targ
 
                fractional_pos = 1.0;
 
-               for (nframes_t nx = 0; nx < declick; ++nx) {
+               for (pframes_t nx = 0; nx < declick; ++nx) {
                        buffer[nx] *= (initial + (delta * (0.5 + 0.5 * cos (M_PI * fractional_pos))));
                        fractional_pos += fractional_shift;
                }
@@ -198,7 +199,7 @@ Amp::apply_gain (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t targ
 }
 
 void
-Amp::declick (BufferSet& bufs, nframes_t nframes, int dir)
+Amp::declick (BufferSet& bufs, framecnt_t nframes, int dir)
 {
         /* Almost exactly like ::apply_gain() but skips MIDI buffers and has fixed initial+target
            values.
@@ -208,9 +209,9 @@ Amp::declick (BufferSet& bufs, nframes_t nframes, int dir)
                return;
        }
 
-       const nframes_t declick = std::min ((nframes_t)128, nframes);
+       const framecnt_t declick = std::min ((framecnt_t) 128, nframes);
        gain_t         delta, initial, target;
-       double         fractional_shift = -1.0/declick;
+       double         fractional_shift = -1.0/(declick-1);
        double         fractional_pos;
 
        if (dir < 0) {
@@ -232,7 +233,7 @@ Amp::declick (BufferSet& bufs, nframes_t nframes, int dir)
 
                fractional_pos = 1.0;
 
-               for (nframes_t nx = 0; nx < declick; ++nx) {
+               for (pframes_t nx = 0; nx < declick; ++nx) {
                        buffer[nx] *= (initial + (delta * (0.5 + 0.5 * cos (M_PI * fractional_pos))));
                        fractional_pos += fractional_shift;
                }
@@ -251,7 +252,7 @@ Amp::declick (BufferSet& bufs, nframes_t nframes, int dir)
 }
 
 void
-Amp::apply_gain (AudioBuffer& buf, nframes_t nframes, gain_t initial, gain_t target)
+Amp::apply_gain (AudioBuffer& buf, framecnt_t nframes, gain_t initial, gain_t target)
 {
         /** Apply a (potentially) declicked gain to the contents of @a buf
         */
@@ -266,7 +267,7 @@ Amp::apply_gain (AudioBuffer& buf, nframes_t nframes, gain_t initial, gain_t tar
                return;
        }
 
-       const nframes_t declick = std::min ((nframes_t)128, nframes);
+       const framecnt_t declick = std::min ((framecnt_t) 128, nframes);
        gain_t         delta;
        double         fractional_shift = -1.0/declick;
        double         fractional_pos;
@@ -284,7 +285,7 @@ Amp::apply_gain (AudioBuffer& buf, nframes_t nframes, gain_t initial, gain_t tar
         
         fractional_pos = 1.0;
         
-        for (nframes_t nx = 0; nx < declick; ++nx) {
+        for (pframes_t nx = 0; nx < declick; ++nx) {
                 buffer[nx] *= (initial + (delta * (0.5 + 0.5 * cos (M_PI * fractional_pos))));
                 fractional_pos += fractional_shift;
         }
@@ -302,7 +303,7 @@ Amp::apply_gain (AudioBuffer& buf, nframes_t nframes, gain_t initial, gain_t tar
 }
 
 void
-Amp::apply_simple_gain (BufferSet& bufs, nframes_t nframes, gain_t target)
+Amp::apply_simple_gain (BufferSet& bufs, framecnt_t nframes, gain_t target)
 {
        if (target == 0.0) {
 
@@ -341,7 +342,7 @@ Amp::apply_simple_gain (BufferSet& bufs, nframes_t nframes, gain_t target)
 }
 
 void
-Amp::apply_simple_gain (AudioBuffer& buf, nframes_t nframes, gain_t target)
+Amp::apply_simple_gain (AudioBuffer& buf, framecnt_t nframes, gain_t target)
 {
        if (target == 0.0) {
                 memset (buf.data(), 0, sizeof (Sample) * nframes);
@@ -353,7 +354,7 @@ Amp::apply_simple_gain (AudioBuffer& buf, nframes_t nframes, gain_t target)
 void
 Amp::inc_gain (gain_t factor, void *src)
 {
-       float desired_gain = _gain_control->user_float();
+       float desired_gain = _gain_control->user_double();
 
        if (desired_gain == 0.0f) {
                set_gain (0.000001f + (0.000001f * factor), src);
@@ -379,7 +380,7 @@ Amp::set_gain (gain_t val, void *src)
                return;
        }
 
-       _gain_control->set_float(val, false);
+       _gain_control->set_double(val, false);
        _session.set_dirty();
 }
 
@@ -388,10 +389,7 @@ Amp::state (bool full_state)
 {
        XMLNode& node (Processor::state (full_state));
        node.add_property("type", "amp");
-
-       char buf[32];
-       snprintf (buf, sizeof (buf), "%2.12f", _gain_control->get_value());
-       node.add_property("gain", buf);
+        node.add_child_nocopy (_gain_control->get_state());
 
        return node;
 }
@@ -399,42 +397,38 @@ Amp::state (bool full_state)
 int
 Amp::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop;
+        XMLNode* gain_node;
 
        Processor::set_state (node, version);
-       prop = node.property ("gain");
-
-       if (prop) {
-               gain_t val;
-
-               if (sscanf (prop->value().c_str(), "%f", &val) == 1) {
-                       _gain_control->set_value (val);
-               }
-       }
 
+        if ((gain_node = node.child (Controllable::xml_node_name.c_str())) != 0) {
+                _gain_control->set_state (*gain_node, version);
+        }
+        
        return 0;
 }
 
 void
-Amp::GainControl::set_value (float val)
+Amp::GainControl::set_value (double val)
 {
        // max gain at about +6dB (10.0 ^ ( 6 dB * 0.05))
-       if (val > 1.99526231f)
+       if (val > 1.99526231f) {
                val = 1.99526231f;
+       }
 
        _amp->set_gain (val, this);
 
        AutomationControl::set_value(val);
 }
 
-float
+double
 Amp::GainControl::get_value (void) const
 {
        return AutomationControl::get_value();
 }
 
 void
-Amp::setup_gain_automation (sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
+Amp::setup_gain_automation (framepos_t start_frame, framepos_t end_frame, framecnt_t nframes)
 {
        Glib::Mutex::Lock am (control_lock(), Glib::TRY_LOCK);