Some improvements to performance with crossfades: don't recompute a whole track's...

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

diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc
index cc63353886214cfc953d7e04bf985dde9ce63496..b8e0ad700f12c3530a05859fb28f5635ab31f4a7 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"
 
@@ -71,7 +72,7 @@ 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;
 
@@ -153,6 +154,18 @@ Amp::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t
                                /* gain has not changed, but its non-unity
                                */
 
+                               for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) {
+
+                                       MidiBuffer& mb (*i);
+                                       
+                                       for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) {
+                                               Evoral::MIDIEvent<MidiBuffer::TimeType> ev = *m;
+                                               if (ev.is_note_on()) {
+                                                       ev.scale_velocity (_current_gain);
+                                               }
+                                       }
+                               }
+
                                for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) {
                                        apply_gain_to_buffer (i->data(), nframes, _current_gain);
                                }
@@ -193,9 +206,29 @@ 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) {
+
+
+               MidiBuffer& mb (*i);
+               
+               for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) {
+                       Evoral::MIDIEvent<MidiBuffer::TimeType> ev = *m;
+
+                       if (ev.is_note_on()) {
+                               gain_t scale = delta * (ev.time()/nframes);
+                               std::cerr << "scale by " << scale << " for " << ev.time() << " of " << nframes << std::endl;
+                               ev.scale_velocity (scale);
+                       }
+               }
+       }
+
+       /* 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) {
@@ -220,10 +253,35 @@ void
 Amp::apply_simple_gain (BufferSet& bufs, nframes_t nframes, gain_t target)
 {
        if (target == 0.0) {
+
+               for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) {
+                       MidiBuffer& mb (*i);
+               
+                       for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) {
+                               Evoral::MIDIEvent<MidiBuffer::TimeType> ev = *m;
+                               if (ev.is_note_on()) {
+                                       ev.set_velocity (0);
+                               }
+                       }
+               }
+
                for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) {
                        memset (i->data(), 0, sizeof (Sample) * nframes);
                }
+
        } else if (target != 1.0) {
+
+               for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) {
+                       MidiBuffer& mb (*i);
+               
+                       for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) {
+                               Evoral::MIDIEvent<MidiBuffer::TimeType> ev = *m;
+                               if (ev.is_note_on()) {
+                                       ev.scale_velocity (target);
+                               }
+                       }
+               }
+
                for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) {
                        apply_gain_to_buffer (i->data(), nframes, target);
                }