diff options
| author | David Robillard <d@drobilla.net> | 2015-03-28 23:24:41 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2015-03-29 00:51:56 -0400 |
| commit | c9023ae73d6d70fead3e827811b384e2b171e4d6 (patch) | |
| tree | 3a6cb5a0a7d436bed457f961afb272b82f1626be /libs/ardour/ardour/midi_source.h | |
| parent | 050c9c3f7d695ea8736d050f3eac5c4f0a3158ca (diff) | |
Fix mute of MIDI tracks with channel forcing.
This moves MIDI channel filtering into a reusable class and moves filtering to
the source, rather than modifying the buffer afterwards. This is necessary so
that the playlist trackers reflect the emitted notes (and thus are able to stop
them in situations like mute).
As a perk, this is also faster because events are just dropped on read, rather
than pushed into a buffer then later removed (which is very slow).
Really hammering on mute or solo still seems to produce stuck notes
occasionally (perhaps related to multiple-on warnings). I am not yet sure why,
but occasional beats always.
Diffstat (limited to 'libs/ardour/ardour/midi_source.h')
| -rw-r--r-- | libs/ardour/ardour/midi_source.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 156f3dbfa0..6a55398ca9 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -34,6 +34,7 @@ namespace ARDOUR { +class MidiChannelFilter; class MidiStateTracker; class MidiModel; @@ -77,6 +78,7 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha framepos_t start, framecnt_t cnt, MidiStateTracker* tracker, + MidiChannelFilter* filter, const std::set<Evoral::Parameter>& filtered) const; /** Write data from a MidiRingBuffer to this source. @@ -192,7 +194,8 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha framepos_t position, framepos_t start, framecnt_t cnt, - MidiStateTracker* tracker) const = 0; + MidiStateTracker* tracker, + MidiChannelFilter* filter) const = 0; /** Write data to this source from a MidiRingBuffer. * @param source Buffer to read from. |