diff options
| author | David Robillard <d@drobilla.net> | 2016-11-08 20:34:45 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2016-11-08 20:34:45 -0500 |
| commit | c61373212a87e519276d4c011994e2d37c77ee16 (patch) | |
| tree | 216e0fcd47e24cd8db0511a074d2d203cb18fa5e /libs/ardour/ardour/midi_model.h | |
| parent | 72297c0ca31400767177bbcb9310721c481a7dd8 (diff) | |
Support multiple readers for MIDI source/model
Fixes the multiple reader issue #6541 properly without resorting to a
linear search kludge.
All the read state has been pulled out into a MidiCursor which the
caller is required to pass. The playlist keeps cursors for all the
regions it is reading, any number of cursors are allowed at a time.
MidiCursor should probably be made a smarter and more fool-proof
object (and/or possibly merged with some of the other tracker/fixer
stuff) but for now I wanted to keep it simple.
Diffstat (limited to 'libs/ardour/ardour/midi_model.h')
| -rw-r--r-- | libs/ardour/ardour/midi_model.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index c5467cc58d..cdf7b3fd3b 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -292,8 +292,6 @@ public: void insert_silence_at_start (TimeType); void transpose (NoteDiffCommand *, const NotePtr, int); - std::set<WeakNotePtr>& active_notes() { return _active_notes; } - protected: int resolve_overlaps_unlocked (const NotePtr, void* arg = 0); @@ -327,8 +325,6 @@ private: // We cannot use a boost::shared_ptr here to avoid a retain cycle boost::weak_ptr<MidiSource> _midi_source; InsertMergePolicy _insert_merge_policy; - - std::set<WeakNotePtr> _active_notes; }; } /* namespace ARDOUR */ |