ardour/livetrax
13
0
Fork 0
Code

implement missing midi event filtering during recording

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13243 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Baier 2012-10-11 05:39:40 +00:00
parent ed05701ccb
commit f61f973f87
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libs/ardour/ardour/midi_ring_buffer.h
View File

@ -54,6 +54,8 @@ public:
inline bool read_contents(uint32_t size, uint8_t* buf); 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); 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 dump(std::ostream& dst);
void flush (framepos_t start, framepos_t end); 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; 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 } // namespace ARDOUR