X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsmf_source.h;h=9c0a78f2823cd9920d8b4e5c892a711d4e47c6a4;hb=f5276a104c2d544cf537db9e9b8de9022de7ad56;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..9c0a78f282 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
@@ -36,26 +36,36 @@ template<typename T> class MidiRingBuffer;
 /** Standard Midi File (Type 0) Source */
 class 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 Glib::ustring& 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);
 
 	virtual ~SMFSource ();
 
-	bool safe_file_extension (const Glib::ustring& path) const {
+	/** Rename the file on disk referenced by this source to \param newname
+	 *
+	 * This method exists only for MIDI file sources, not for audio, which 
+	 * can never be renamed. It exists for MIDI so that we can get
+	 * consistent and sane region/source numbering when regions are added
+	 * manually (which never happens with audio).
+	 */
+	int rename (const std::string& name);
+
+        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,30 +74,34 @@ public:
 	void destroy_model ();
 
 	void flush_midi ();
+	void ensure_disk_file ();
+
+	static bool safe_midi_file_extension (const std::string& path);
+
+	void prevent_deletion ();
 
-	static void set_header_position_offset (nframes_t offset, bool negative);
+  protected:
+	void set_path (const std::string& newpath);
 
-	static bool safe_midi_file_extension (const Glib::ustring& path);
+  private:
+	int open_for_write ();
 
-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;
+	framecnt_t read_unlocked (Evoral::EventSink<framepos_t>& dst,
+	                          framepos_t                     position,
+	                          framepos_t                     start,
+	                          framecnt_t                     cnt,
+	                          MidiStateTracker*              tracker) const;
 
-	nframes_t write_unlocked (MidiRingBuffer<nframes_t>& src,
-			sframes_t position,
-			nframes_t cnt);
+	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;
+	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 */