X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsmf_source.h;h=bd1428a129e3357ac738eb658adefeadebb326d8;hb=844b7d0f684eaf01a8d553f935027f496a09c3ad;hp=e61b3f97374377e38146dd99f86fa83f1df445ff;hpb=8a28ea6154f78d491afe746b3a2b0230185afb91;p=ardour.git

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index e61b3f9737..bd1428a129 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -18,14 +18,14 @@
 
 */
 
-#ifndef __ardour_smf_source_h__ 
+#ifndef __ardour_smf_source_h__
 #define __ardour_smf_source_h__
 
 #include <cstdio>
 #include <time.h>
-#include <evoral/SMF.hpp>
-#include <ardour/midi_source.h>
-#include <ardour/file_source.h>
+#include "evoral/SMF.hpp"
+#include "ardour/midi_source.h"
+#include "ardour/file_source.h"
 
 namespace Evoral { template<typename T> class Event; }
 
@@ -37,54 +37,58 @@ 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 */
 	SMFSource (Session& session, const XMLNode&, bool must_exist = false);
 
 	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<double>& ev);
-	void append_event_unlocked_frames (const Evoral::Event<nframes_t>& ev, sframes_t position);
 
-	void mark_streaming_midi_write_started (NoteMode mode, sframes_t start_time);
+	void append_event_unlocked_beats (const Evoral::Event<Evoral::MusicalTime>& ev);
+	void append_event_unlocked_frames (const Evoral::Event<nframes_t>& ev, framepos_t source_start);
+
+	void mark_streaming_midi_write_started (NoteMode mode, framepos_t start_time);
 	void mark_streaming_write_completed ();
 
 	XMLNode& get_state ();
-	int set_state (const XMLNode&);
+	int set_state (const XMLNode&, int version);
 
 	void load_model (bool lock=true, bool force_reload=false);
 	void destroy_model ();
 
 	void flush_midi ();
-	
+
 	static void set_header_position_offset (nframes_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 (MidiRingBuffer<nframes_t>& dst,
-			sframes_t position,
-			sframes_t start,
-			nframes_t cnt,
-			sframes_t stamp_offset,
-			sframes_t negative_stamp_offset) const;
+  protected:
+        void set_path (const std::string& newpath);
+        
+  private:
+	nframes_t read_unlocked (Evoral::EventSink<nframes_t>& dst,
+				 framepos_t position,
+				 framepos_t start,
+				 nframes_t cnt,
+				 MidiStateTracker* tracker) const;
 
 	nframes_t write_unlocked (MidiRingBuffer<nframes_t>& src,
-			sframes_t position,
+			framepos_t position,
 			nframes_t cnt);
 
-	void set_default_controls_interpolation ();
-
 	double    _last_ev_time_beats;
-	sframes_t _last_ev_time_frames;
+	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 */