make i18n build work ; add mackie dir back to build ; token work on amp for MIDI...

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

diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc
index 154d90956073110ae5bdbce946c0d0be96dad1f8..0efaaa35358bd1c20ee9eaf8b625278037608060 100644 (file)
--- a/libs/ardour/amp.cc
+++ b/libs/ardour/amp.cc
@@ -28,6 +28,7 @@
 #include "ardour/buffer_set.h"
 #include "ardour/configuration.h"
 #include "ardour/io.h"
+#include "ardour/midi_buffer.h"
 #include "ardour/mute_master.h"
 #include "ardour/session.h"
 
@@ -47,6 +48,12 @@ Amp::Amp(Session& s, boost::shared_ptr<MuteMaster> mm)
        add_control(_gain_control);
 }
 
+std::string
+Amp::display_name() const
+{
+       return _("Fader");
+}
+
 bool
 Amp::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
 {
@@ -65,10 +72,14 @@ Amp::configure_io (ChanCount in, ChanCount out)
 }
 
 void
-Amp::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
+Amp::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t nframes)
 {
        gain_t mute_gain;
 
+       if (!_active && !_pending_active) {
+               return;
+       }
+
        if (_mute_master) {
                mute_gain = _mute_master->mute_gain_at (MuteMaster::PreFader);
        } else {
@@ -149,6 +160,8 @@ Amp::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t
                        } 
                }
        }
+
+       _active = _pending_active;
 }
 
 void
@@ -181,9 +194,26 @@ Amp::apply_gain (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t targ
                delta = target - initial;
        }
 
+       /* MIDI Gain */
+
+       for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) {
+#if 0
+               MidiBuffer& mb (*i);
+
+               for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) {
+                       Evoral::MIDIEvent<MidiBuffer::TimeType> ev (*m);
+                       if (ev.buffer()[0] == MIDI_CMD_NOTE_ON) {
+                               ev.buffer()[2] = (uint8_t) rint (ev.buffer()[2] * 1.0);
+                       }
+               }
+#endif
+       }
+
+       /* Audio Gain */
+
        for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) {
                Sample* const buffer = i->data();
-
+               
                fractional_pos = 1.0;
 
                for (nframes_t nx = 0; nx < declick; ++nx) {
@@ -222,6 +252,7 @@ void
 Amp::inc_gain (gain_t factor, void *src)
 {
        float desired_gain = _gain_control->user_float();
+       
        if (desired_gain == 0.0f) {
                set_gain (0.000001f + (0.000001f * factor), src);
        } else {
@@ -240,28 +271,13 @@ Amp::set_gain (gain_t val, void *src)
        //cerr << "set desired gain to " << val << " when curgain = " << _gain_control->get_value () << endl;
 
        if (src != _gain_control.get()) {
-               _gain_control->set_value(val);
+               _gain_control->set_value (val);
                // bit twisty, this will come back and call us again
                // (this keeps control in sync with reality)
                return;
        }
 
-       {
-               // Glib::Mutex::Lock dm (declick_lock);
-               _gain_control->set_float(val, false);
-       }
-
-       if (_session.transport_stopped()) {
-               // _gain = val;
-       }
-       
-       /*
-       if (_session.transport_stopped() && src != 0 && src != this && _gain_control->automation_write()) {
-               _gain_control->list()->add (_session.transport_frame(), val);
-               
-       }
-       */
-
+       _gain_control->set_float(val, false);
        _session.set_dirty();
 }
 
@@ -270,9 +286,33 @@ 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);
+
        return node;
 }
 
+int
+Amp::set_state (const XMLNode& node)
+{
+       const XMLProperty* prop;
+
+       Processor::set_state (node);
+       prop = node.property ("gain");
+
+       if (prop) {
+               gain_t val;
+
+               if (sscanf (prop->value().c_str(), "%f", &val) == 1) {
+                       _gain_control->set_value (val);
+               }
+       }
+
+       return 0;
+}
+
 void
 Amp::GainControl::set_value (float val)
 {
@@ -303,3 +343,9 @@ Amp::setup_gain_automation (sframes_t start_frame, sframes_t end_frame, nframes_
                _apply_gain_automation = false;
        }
 }
+
+bool
+Amp::visible() const
+{
+       return true;
+}