X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fardour%2Fsmf_source.h;h=b94ffb250f7351b6cbb9cee1480db301cda82778;hb=bc3aea6f93edf23c19dc672dd5b1f44bca71f571;hp=bd1428a129e3357ac738eb658adefeadebb326d8;hpb=ede4ecbb00ecc866c502454c81e711baea780ccd;p=ardour.git

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index bd1428a129..b94ffb250f 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 std::string& path, 
+	SMFSource (Session& session, const std::string& path,
 			Source::Flag flags = Source::Flag(0));
 
 	/** Constructor for existing in-session files */
@@ -52,10 +52,11 @@ public:
 	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, framepos_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, framepos_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,24 +65,25 @@ public:
 	void destroy_model ();
 
 	void flush_midi ();
-
-	static void set_header_position_offset (nframes_t offset, bool negative);
+	void ensure_disk_file ();
 
 	static bool safe_midi_file_extension (const std::string& path);
 
   protected:
-        void set_path (const std::string& newpath);
-        
+	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,
-			framepos_t position,
-			nframes_t cnt);
+	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;
+
+	framecnt_t write_unlocked (MidiRingBuffer<framepos_t>& src,
+				   framepos_t position,
+				   framecnt_t cnt);
 
 	double    _last_ev_time_beats;
 	framepos_t _last_ev_time_frames;