X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsmf_source.h;h=eb1bcaca9a73d3beff9de443cfbc91aded45fd5c;hb=494635b99b9cdac42fd7a14e80c78ce437d6f606;hp=5ded3537e9e508b87b6a5ad6326637ddf3629b19;hpb=f8fe64a91e7ae7f6ac761e8ae16a485ed70fb994;p=ardour.git

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index 5ded3537e9..eb1bcaca9a 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2006 Paul Davis
-	Written by Dave Robillard, 2006
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ template<typename T> class MidiRingBuffer;
 class SMFSource : public MidiSource, public FileSource, public Evoral::SMF {
 public:
 	/** Constructor for existing external-to-session files */
-	SMFSource (Session& session, const Glib::ustring& path, bool embedded,
+	SMFSource (Session& session, const std::string& path,
 			Source::Flag flags = Source::Flag(0));
 
 	/** Constructor for existing in-session files */
@@ -45,17 +45,18 @@ public:
 
 	virtual ~SMFSource ();
 
-	bool safe_file_extension (const Glib::ustring& path) const {
+	bool safe_file_extension (const std::string& path) const {
 		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<nframes_t>& ev, sframes_t source_start);
+	void append_event_unlocked_frames (const Evoral::Event<framepos_t>& ev, framepos_t source_start);
 
-	void mark_streaming_midi_write_started (NoteMode mode, sframes_t start_time);
+	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);
 
 	XMLNode& get_state ();
 	int set_state (const XMLNode&, int version);
@@ -64,29 +65,34 @@ public:
 	void destroy_model ();
 
 	void flush_midi ();
+	void ensure_disk_file ();
 
-	static void set_header_position_offset (nframes_t offset, bool negative);
+	static void set_header_position_offset (framecnt_t offset, bool negative);
 
-	static bool safe_midi_file_extension (const Glib::ustring& path);
+	static bool safe_midi_file_extension (const std::string& path);
 
-private:
-	nframes_t read_unlocked (Evoral::EventSink<nframes_t>& dst,
-				 sframes_t position,
-				 sframes_t start,
-				 nframes_t cnt,
-				 sframes_t stamp_offset,
-				 sframes_t negative_stamp_offset,
-				 MidiStateTracker* tracker) const;
+  protected:
+	void set_path (const std::string& newpath);
 
-	nframes_t write_unlocked (MidiRingBuffer<nframes_t>& src,
-			sframes_t position,
-			nframes_t cnt);
+  private:
+	int open_for_write ();
 
-	void set_default_controls_interpolation ();
+	framecnt_t read_unlocked (Evoral::EventSink<framepos_t>& dst,
+				  framepos_t position,
+				  framepos_t start,
+				  framecnt_t cnt,
+				  MidiStateTracker* tracker) const;
+
+	framecnt_t write_unlocked (MidiRingBuffer<framepos_t>& src,
+				   framepos_t position,
+				   framecnt_t cnt);
 
 	double    _last_ev_time_beats;
-	sframes_t _last_ev_time_frames;
-	mutable sframes_t _smf_last_read_end;
+	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 */