X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsmf_source.h;h=979c20dd2140632f800d16799fbfd995b33563c9;hb=eaa1dacf5fc9537cfff36e2339bd07aab348aa2e;hp=84c45f9b3cf342be199c2e552c58daa74c715f12;hpb=e5e12acc5698090f2c0c614385e457cc0b46fbb0;p=ardour.git

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index 84c45f9b3c..979c20dd21 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -47,25 +47,24 @@ public:
 
 	virtual ~SMFSource ();
 
-        bool safe_file_extension (const std::string& path) const {
+	bool safe_file_extension (const std::string& path) const {
 		return safe_midi_file_extension(path);
 	}
 
-	void append_event_unlocked_beats (const Evoral::Event<Evoral::MusicalTime>& ev);
-	void append_event_unlocked_frames (const Evoral::Event<framepos_t>& ev, framepos_t source_start);
+	void append_event_beats (const Lock& lock, const Evoral::Event<Evoral::Beats>& ev);
+	void append_event_frames (const Lock& lock, const Evoral::Event<framepos_t>& ev, framepos_t source_start);
 
-	void mark_streaming_midi_write_started (NoteMode mode);
-	void mark_streaming_write_completed ();
-	void mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::StuckNoteOption, Evoral::MusicalTime when = 0);
+	void mark_streaming_midi_write_started (const Lock& lock, NoteMode mode);
+	void mark_streaming_write_completed (const Lock& lock);
+	void mark_midi_streaming_write_completed (const Lock& lock,
+	                                          Evoral::Sequence<Evoral::Beats>::StuckNoteOption,
+	                                          Evoral::Beats when = Evoral::Beats());
 
 	XMLNode& get_state ();
 	int set_state (const XMLNode&, int version);
 
-	void load_model (bool lock=true, bool force_reload=false);
-	void destroy_model ();
-
-	void flush_midi ();
-	void ensure_disk_file ();
+	void load_model (const Glib::Threads::Mutex::Lock& lock, bool force_reload=false);
+	void destroy_model (const Glib::Threads::Mutex::Lock& lock);
 
 	static bool safe_midi_file_extension (const std::string& path);
 	static bool valid_midi_file (const std::string& path);
@@ -73,27 +72,37 @@ public:
 	void prevent_deletion ();
 
   protected:
+	void close ();
 	void set_path (const std::string& newpath);
+	void flush_midi (const Lock& lock);
 
   private:
+	bool _open;
+	Evoral::Beats       _last_ev_time_beats;
+	framepos_t          _last_ev_time_frames;
+	/** end time (start + duration) of last call to read_unlocked */
+	mutable framepos_t _smf_last_read_end;
+	/** time (in SMF ticks, 1 tick per _ppqn) of the last event read by read_unlocked */
+	mutable framepos_t _smf_last_read_time;
+
 	int open_for_write ();
 
-	framecnt_t read_unlocked (Evoral::EventSink<framepos_t>& dst,
+	void ensure_disk_file (const Lock& lock);
+
+	framecnt_t read_unlocked (const Lock&                    lock,
+	                          Evoral::EventSink<framepos_t>& dst,
 	                          framepos_t                     position,
 	                          framepos_t                     start,
 	                          framecnt_t                     cnt,
-	                          MidiStateTracker*              tracker) const;
+	                          Evoral::Range<framepos_t>*     loop_range,
+	                          MidiStateTracker*              tracker,
+	                          MidiChannelFilter*             filter) const;
 
-	framecnt_t write_unlocked (MidiRingBuffer<framepos_t>& src,
+	framecnt_t write_unlocked (const Lock&                 lock,
+	                           MidiRingBuffer<framepos_t>& src,
 	                           framepos_t                  position,
 	                           framecnt_t                  cnt);
 
-	double    _last_ev_time_beats;
-	framepos_t _last_ev_time_frames;
-	/** end time (start + duration) of last call to read_unlocked */
-	mutable framepos_t _smf_last_read_end;
-	/** time (in SMF ticks, 1 tick per _ppqn) of the last event read by read_unlocked */
-	mutable framepos_t _smf_last_read_time;
 };
 
 }; /* namespace ARDOUR */