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

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index 6dcea9dd60..bd1428a129 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -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, 
+	SMFSource (Session& session, const std::string& path, 
 			Source::Flag flags = Source::Flag(0));
 
 	/** Constructor for existing in-session files */
@@ -45,16 +45,16 @@ 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<nframes_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, framepos_t start_time);
 	void mark_streaming_write_completed ();
 
 	XMLNode& get_state ();
@@ -67,27 +67,28 @@ public:
 
 	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:
+  protected:
+        void set_path (const std::string& newpath);
+        
+  private:
 	nframes_t read_unlocked (Evoral::EventSink<nframes_t>& dst,
-				 sframes_t position,
-				 sframes_t start,
+				 framepos_t position,
+				 framepos_t start,
 				 nframes_t cnt,
-				 sframes_t stamp_offset,
-				 sframes_t negative_stamp_offset,
 				 MidiStateTracker* tracker) const;
 
 	nframes_t write_unlocked (MidiRingBuffer<nframes_t>& src,
-			sframes_t position,
+			framepos_t position,
 			nframes_t cnt);
 
 	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 sframes_t _smf_last_read_end;
+	mutable framepos_t _smf_last_read_end;
 	/** time (in SMF ticks, 1 tick per _ppqn) of the last event read by read_unlocked */
-	mutable sframes_t _smf_last_read_time;
+	mutable framepos_t _smf_last_read_time;
 };
 
 }; /* namespace ARDOUR */