From c61373212a87e519276d4c011994e2d37c77ee16 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 8 Nov 2016 20:34:45 -0500 Subject: 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. --- libs/ardour/ardour/midi_model.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'libs/ardour/ardour/midi_model.h') 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& 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 _midi_source; InsertMergePolicy _insert_merge_policy; - - std::set _active_notes; }; } /* namespace ARDOUR */ -- cgit v1.2.3