X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_source.h;h=6a55398ca9a2afbacb5c21c5a238b3cc23a682fb;hb=5c32fc3babdd3ed7d715b6aeb24a72f3a0f550a0;hp=2ce92ba3cfd41d4a2af9987cf825b6129e5cd591;hpb=c1cfa12d6e5136d2e3e5501e83ff74c5009a9e60;p=ardour.git diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 2ce92ba3cf..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; @@ -43,7 +44,7 @@ template class MidiRingBuffer; class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_shared_from_this { public: - typedef Evoral::MusicalTime TimeType; + typedef Evoral::Beats TimeType; MidiSource (Session& session, std::string name, Source::Flag flags = Source::Flag(0)); MidiSource (Session& session, const XMLNode&); @@ -57,9 +58,10 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha * \param end time of latest event that can be written. * \return zero on success, non-zero if the write failed for any reason. */ - int write_to (boost::shared_ptr newsrc, - Evoral::MusicalTime begin = Evoral::MinMusicalTime, - Evoral::MusicalTime end = Evoral::MaxMusicalTime); + int write_to (const Lock& lock, + boost::shared_ptr newsrc, + Evoral::Beats begin = Evoral::MinBeats, + Evoral::Beats end = Evoral::MaxBeats); /** Read the data in a given time range from the MIDI source. * All time stamps in parameters are in audio frames (even if the source has tempo time). @@ -70,11 +72,13 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha * \param tracker an optional pointer to MidiStateTracker object, for note on/off tracking. * \param filtered Parameters whose MIDI messages will not be returned. */ - virtual framecnt_t midi_read (Evoral::EventSink& dst, + virtual framecnt_t midi_read (const Lock& lock, + Evoral::EventSink& dst, framepos_t source_start, framepos_t start, framecnt_t cnt, MidiStateTracker* tracker, + MidiChannelFilter* filter, const std::set& filtered) const; /** Write data from a MidiRingBuffer to this source. @@ -82,22 +86,33 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha * @param source_start This source's start position in session frames. * @param cnt The length of time to write. */ - virtual framecnt_t midi_write (MidiRingBuffer& src, + virtual framecnt_t midi_write (const Lock& lock, + MidiRingBuffer& src, framepos_t source_start, framecnt_t cnt); - virtual void append_event_unlocked_beats(const Evoral::Event& ev) = 0; + /** Append a single event with a timestamp in beats. + * + * Caller must ensure that the event is later than the last written event. + */ + virtual void append_event_beats(const Lock& lock, + const Evoral::Event& ev) = 0; - virtual void append_event_unlocked_frames(const Evoral::Event& ev, - framepos_t source_start) = 0; + /** Append a single event with a timestamp in frames. + * + * Caller must ensure that the event is later than the last written event. + */ + virtual void append_event_frames(const Lock& lock, + const Evoral::Event& ev, + framepos_t source_start) = 0; virtual bool empty () const; virtual framecnt_t length (framepos_t pos) const; virtual void update_length (framecnt_t); - virtual void mark_streaming_midi_write_started (NoteMode mode); - virtual void mark_streaming_write_started (); - virtual void mark_streaming_write_completed (); + virtual void mark_streaming_midi_write_started (const Lock& lock, NoteMode mode); + virtual void mark_streaming_write_started (const Lock& lock); + virtual void mark_streaming_write_completed (const Lock& lock); /** Mark write starting with the given time parameters. * @@ -119,8 +134,9 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha * etc. */ virtual void mark_midi_streaming_write_completed ( - Evoral::Sequence::StuckNoteOption stuck_option, - Evoral::MusicalTime when = Evoral::MusicalTime()); + const Lock& lock, + Evoral::Sequence::StuckNoteOption stuck_option, + Evoral::Beats when = Evoral::Beats()); virtual void session_saved(); @@ -137,19 +153,21 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha void set_length_beats(TimeType l) { _length_beats = l; } TimeType length_beats() const { return _length_beats; } - virtual void load_model(bool lock=true, bool force_reload=false) = 0; - virtual void destroy_model() = 0; + virtual void load_model(const Glib::Threads::Mutex::Lock& lock, bool force_reload=false) = 0; + virtual void destroy_model(const Glib::Threads::Mutex::Lock& lock) = 0; - /** This must be called with the source lock held whenever the - * source/model contents have been changed (reset iterators/cache/etc). + /** Reset cached information (like iterators) when things have changed. + * @param lock Source lock, which must be held by caller. + * @param notes If non-NULL, currently active notes are added to this set. */ - void invalidate(); + void invalidate(const Glib::Threads::Mutex::Lock& lock, + std::set::WeakNotePtr>* notes=NULL); - void set_note_mode(NoteMode mode); + void set_note_mode(const Glib::Threads::Mutex::Lock& lock, NoteMode mode); boost::shared_ptr model() { return _model; } - void set_model (boost::shared_ptr); - void drop_model(); + void set_model(const Glib::Threads::Mutex::Lock& lock, boost::shared_ptr); + void drop_model(const Glib::Threads::Mutex::Lock& lock); Evoral::ControlList::InterpolationStyle interpolation_of (Evoral::Parameter) const; void set_interpolation_of (Evoral::Parameter, Evoral::ControlList::InterpolationStyle); @@ -169,20 +187,23 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha PBD::Signal2 AutomationStateChanged; protected: - virtual void flush_midi() = 0; + virtual void flush_midi(const Lock& lock) = 0; - virtual framecnt_t read_unlocked (Evoral::EventSink& dst, + virtual framecnt_t read_unlocked (const Lock& lock, + Evoral::EventSink& dst, 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. * @param position This source's start position in session frames. * @param cnt The duration of this block to write for. */ - virtual framecnt_t write_unlocked (MidiRingBuffer& source, + virtual framecnt_t write_unlocked (const Lock& lock, + MidiRingBuffer& source, framepos_t position, framecnt_t cnt) = 0; @@ -191,11 +212,11 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha boost::shared_ptr _model; bool _writing; - mutable Evoral::Sequence::const_iterator _model_iter; - mutable bool _model_iter_valid; + mutable Evoral::Sequence::const_iterator _model_iter; + mutable bool _model_iter_valid; - mutable Evoral::MusicalTime _length_beats; - mutable framepos_t _last_read_end; + mutable Evoral::Beats _length_beats; + mutable framepos_t _last_read_end; /** The total duration of the current capture. */ framepos_t _capture_length;