make i18n build work ; add mackie dir back to build ; token work on amp for MIDI; don't try to subgroup route groups with MIDI (for now)

git-svn-id: svn://localhost/ardour2/branches/3.0@5412 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 19 insertions, 1 deletions

diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc
index c5183eb3db..0efaaa3535 100644
--- 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"
 
@@ -193,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) {