implement missing midi event filtering during recording

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

diff --git a/libs/ardour/ardour/midi_ring_buffer.h b/libs/ardour/ardour/midi_ring_buffer.h
index 539d281252db9aed181c3fac8742aa3dc470af4f..f4580b37a6fddaf23c46e1ce67c9b19461434027 100644 (file)
--- a/libs/ardour/ardour/midi_ring_buffer.h
+++ b/libs/ardour/ardour/midi_ring_buffer.h
@@ -54,6 +54,8 @@ public:
        inline bool read_contents(uint32_t size, uint8_t* buf);
 
        size_t read(MidiBuffer& dst, framepos_t start, framepos_t end, framecnt_t offset=0, bool stop_on_overflow_in_destination=false);
+       inline uint32_t write(T  time, Evoral::EventType  type, uint32_t  size, const uint8_t* buf);
+
        void dump(std::ostream& dst);
        void flush (framepos_t start, framepos_t end);
 
@@ -135,6 +137,37 @@ MidiRingBuffer<T>::read_contents(uint32_t size, uint8_t* buf)
        return PBD::RingBufferNPT<uint8_t>::read(buf, size) == size;
 }
 
+template<typename T>
+inline uint32_t
+MidiRingBuffer<T>::write(T time, Evoral::EventType type, uint32_t size, const uint8_t* buf)
+{
+       assert(size > 0);
+       uint8_t status = buf[0];
+
+       // Ignore event if it doesn't match channel filter
+       if (is_channel_event(status)) {
+               ChannelMode mode = get_channel_mode();
+               if (mode == FilterChannels) {
+                       const uint8_t channel = status & 0x0F;
+                       if (!(get_channel_mask() & (1L << channel))) {
+                               return 0;
+                       }
+               } else if (mode == ForceChannel) {
+                       uint8_t* tmpbuf = (uint8_t*) malloc(size);
+                       assert(tmpbuf);
+                       memcpy(tmpbuf, buf, size);
+
+                       tmpbuf[0] = (tmpbuf[0] & 0xF0) | (get_channel_mask() & 0x0F);
+
+                       uint32_t bytes_written = Evoral::EventRingBuffer<T>::write(time, type, size, tmpbuf);
+                       free(tmpbuf);
+                       return bytes_written;
+               }
+       }
+
+       return Evoral::EventRingBuffer<T>::write(time, type, size, buf);
+}
+
 
 } // namespace ARDOUR