Merge branch 'ardour'

gtk2_ardour/midi_tracer.cc

@@ -338,9 +338,9 @@ MidiTracer::tracer (Parser&, MIDI::byte* msg, size_t len, samplecnt_t now)
 
 	case polypress:
 		if (show_hex) {
-			s += snprintf (&buf[s], bufsize, "%16s chn %2d %02x\n", "PolyPressure", (msg[0]&0xf)+1, (int) msg[1]);
+			s += snprintf (&buf[s], bufsize, "%16s chn %2d %02x %02x\n", "PolyPressure", (msg[0]&0xf)+1, (int) msg[1], msg[2]);
 		} else {
-			s += snprintf (&buf[s], bufsize, "%16s chn %2d %-3d\n", "PolyPressure", (msg[0]&0xf)+1, (int) msg[1]);
+			s += snprintf (&buf[s], bufsize, "%16s chn %2d %-3d %-3d\n", "PolyPressure", (msg[0]&0xf)+1, (int) msg[1], msg[2]);
 		}
 		break;
 
@@ -362,9 +362,9 @@ MidiTracer::tracer (Parser&, MIDI::byte* msg, size_t len, samplecnt_t now)
 
 	case chanpress:
 		if (show_hex) {
-			s += snprintf (&buf[s], bufsize, "%16s chn %2d %02x/%-3d\n", "Channel Pressure", (msg[0]&0xf)+1, (int) msg[1], (int) msg[1]);
+			s += snprintf (&buf[s], bufsize, "%16s chn %2d %02x\n", "Channel Pressure", (msg[0]&0xf)+1, (int) msg[1]);
 		} else {
-			s += snprintf (&buf[s], bufsize, "%16s chn %2d %02x/%-3d\n", "Channel Pressure", (msg[0]&0xf)+1, (int) msg[1], (int) msg[1]);
+			s += snprintf (&buf[s], bufsize, "%16s chn %2d %-3d\n", "Channel Pressure", (msg[0]&0xf)+1, (int) msg[1]);
 		}
 		break;
 

libs/ardour/ardour/audio_buffer.h

@@ -42,6 +42,8 @@ public:
 	 */
 	void silence (samplecnt_t len, samplecnt_t offset = 0);
 
+	bool silent_data() const;
+
 	/** Copy samples from src array starting at src_offset into self starting at dst_offset
 	 * @param src array to read from
 	 * @param len number of samples to copy

libs/ardour/ardour/buffer.h

@@ -69,6 +69,9 @@ public:
 	/** Clear (eg zero, or empty) buffer */
 	virtual void silence (samplecnt_t len, samplecnt_t offset = 0) = 0;
 
+	/* return true if all data is silent (or for MIDI-like, non-existent */
+	virtual bool silent_data () const = 0;
+
 	/** Clear the entire buffer */
 	virtual void clear() { silence(_capacity, 0); }
 

libs/ardour/ardour/buffer_set.h

@@ -82,6 +82,9 @@ public:
 	void ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capacity);
 	void ensure_buffers(const ChanCount& chns, size_t buffer_capacity);
 
+	/* Returns true if Buffer::silent_data() is true for all buffers */
+	bool silent_data() const;
+
 	const ChanCount& available() const { return _available; }
 	ChanCount&       available()       { return _available; }
 

libs/ardour/ardour/midi_buffer.h

@@ -59,6 +59,7 @@ public:
 	void resize(size_t);
 	size_t size() const { return _size; }
 	bool empty() const { return _size == 0; }
+	bool silent_data () const { return _size == 0; }
 
 	bool insert_event(const Evoral::Event<TimeType>& event);
 	bool merge_in_place(const MidiBuffer &other);

libs/ardour/audio_buffer.cc

@@ -81,6 +81,17 @@ AudioBuffer::check_silence (pframes_t nframes, pframes_t& n) const
 	return true;
 }
 
+bool
+AudioBuffer::silent_data () const
+{
+	for (pframes_t n = 0; n < _capacity; ++n) {
+		if (_data[n]) {
+			return false;
+		}
+	}
+	return true;
+}
+
 void
 AudioBuffer::silence (samplecnt_t len, samplecnt_t offset) {
 

libs/ardour/buffer_set.cc

@@ -229,6 +229,19 @@ BufferSet::ensure_buffers(const ChanCount& chns, size_t buffer_capacity)
 	}
 }
 
+bool
+BufferSet::silent_data () const
+{
+	for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+		for (BufferSet::const_iterator i = begin (*t); i != end (*t); ++i) {
+			if (!i->silent_data ()) {
+				return false;
+			}
+		}
+	}
+	return true;
+}
+
 /** Get the capacity (size) of the available buffers of the given type.
  *
  * All buffers of a certain type always have the same capacity.

share/scripts/dm10studio.lua

@@ -0,0 +1,67 @@
+ardour {
+    ["type"]    = "dsp",
+    name        = "DM10-mkII-Studio HiHat",
+    category    = "Utility",
+    license     = "MIT",
+    author      = "Ardour Community",
+    description = [[Map HiHat MIDI events depending on pedal CC. Specifically MIDI Note Number 8 is translated to 54,47,58 deending on CC-8.]]
+}
+
+function dsp_ioconfig ()
+    return { { midi_in = 1, midi_out = 1, audio_in = 0, audio_out = 0}, }
+end
+
+local hihat_note = -1
+local hihat_state = 0
+
+function dsp_run (_, _, n_samples)
+	assert (type(midiin) == "table")
+	assert (type(midiout) == "table")
+	local cnt = 1;
+
+	function tx_midi (time, data)
+		midiout[cnt] = {}
+		midiout[cnt]["time"] = time;
+		midiout[cnt]["data"] = data;
+		cnt = cnt + 1;
+	end
+
+	-- for each incoming midi event
+	for _,b in pairs (midiin) do
+		local t = b["time"] -- t = [ 1 .. n_samples ]
+		local d = b["data"] -- midi-event data
+		local event_type
+		if #d == 0 then event_type = -1 else event_type = d[1] >> 4 end
+
+		-- intercept CC message
+		if #d == 3 and event_type == 11 and d[2] == 8 then
+			hihat_state = d[3]
+		end
+
+		-- map Note event
+		if (#d == 3) and d[2] == 8 and event_type == 9 then
+			if     hihat_state < 42 then hihat_note = 54 -- Hihat_Closed
+			elseif hihat_state < 92 then hihat_note = 46 -- Hihat_Semi_Open
+			else                         hihat_note = 58 -- Hihat_Open
+			end
+			d[2] = hihat_note
+		end
+
+		-- translate aftertouch
+		if (#d == 3) and d[2] == 8 and event_type == 10 then
+			if (hihat_note > 0) then
+				d[2] = hihat_note
+			end
+		end
+
+		-- intercept note off
+		if (#d == 3) and d[2] == 8 and event_type == 8 then
+			if (hihat_note > 0) then
+				d[2] = hihat_note
+			end
+			--hihat_note = -1
+		end
+
+		tx_midi (t, d)
+	end
+end