X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsmf_source.h;h=88c02beed5ede234d8739115a5d1dc8edb4c4218;hb=c656aaab3c0c66ea0cde210950af341a3d71c559;hp=cf97efe41463a5eec3056b021ac2c73b4aaa16cd;hpb=a473d630eb165272992e90f8d854b1d66ec0be63;p=ardour.git

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index cf97efe414..88c02beed5 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -34,11 +34,13 @@ namespace ARDOUR {
 template<typename T> class MidiRingBuffer;
 
 /** Standard Midi File (Type 0) Source */
-class SMFSource : public MidiSource, public FileSource, public Evoral::SMF {
+class LIBARDOUR_API SMFSource : public MidiSource, public FileSource, public Evoral::SMF {
 public:
+	/** Constructor for new internal-to-session files */
+	SMFSource (Session& session, const std::string& path, Source::Flag flags);
+
 	/** Constructor for existing external-to-session files */
-	SMFSource (Session& session, const std::string& path,
-			Source::Flag flags = Source::Flag(0));
+	SMFSource (Session& session, const std::string& path);
 
 	/** Constructor for existing in-session files */
 	SMFSource (Session& session, const XMLNode&, bool must_exist = false);
@@ -49,49 +51,58 @@ public:
 		return safe_midi_file_extension(path);
 	}
 
-	bool set_name (const std::string& newname) { return (set_source_name(newname, false) == 0); }
-
-	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<Temporal::Beats>& ev);
+	void append_event_samples (const Lock& lock, const Evoral::Event<samplepos_t>& ev, samplepos_t source_start);
 
-	void mark_streaming_midi_write_started (NoteMode mode);
-	void mark_streaming_write_completed ();
+	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<Temporal::Beats>::StuckNoteOption,
+	                                          Temporal::Beats when = Temporal::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 ();
-
-	static void set_header_position_offset (framecnt_t offset, bool negative);
+	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);
 
-  protected:
+	void prevent_deletion ();
 	void set_path (const std::string& newpath);
 
+  protected:
+	void close ();
+	void flush_midi (const Lock& lock);
+
   private:
+	bool _open;
+	Temporal::Beats     _last_ev_time_beats;
+	samplepos_t          _last_ev_time_samples;
+	/** end time (start + duration) of last call to read_unlocked */
+	mutable samplepos_t _smf_last_read_end;
+	/** time (in SMF ticks, 1 tick per _ppqn) of the last event read by read_unlocked */
+	mutable samplepos_t _smf_last_read_time;
+
 	int open_for_write ();
 
-	framecnt_t read_unlocked (Evoral::EventSink<framepos_t>& dst,
-				  framepos_t position,
-				  framepos_t start,
-				  framecnt_t cnt,
-				  MidiStateTracker* tracker) const;
+	void ensure_disk_file (const Lock& lock);
 
-	framecnt_t write_unlocked (MidiRingBuffer<framepos_t>& src,
-				   framepos_t position,
-				   framecnt_t cnt);
+	samplecnt_t read_unlocked (const Lock&                    lock,
+	                          Evoral::EventSink<samplepos_t>& dst,
+	                          samplepos_t                     position,
+	                          samplepos_t                     start,
+	                          samplecnt_t                     cnt,
+	                          Evoral::Range<samplepos_t>*     loop_range,
+	                          MidiStateTracker*              tracker,
+	                          MidiChannelFilter*             filter) const;
+
+	samplecnt_t write_unlocked (const Lock&                 lock,
+	                           MidiRingBuffer<samplepos_t>& src,
+	                           samplepos_t                  position,
+	                           samplecnt_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 */