X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsmf_source.h;h=3c6364532a6f368343b400ca69aeb18f667aea06;hb=79f91c7a205d981d2b8cc15e32a6da02d8423065;hp=ccc03acd667102ab61d701336aae19534107b56c;hpb=5a48f99f72c2e2f3ed313e00446dfdaa05dc5d56;p=ardour.git

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index ccc03acd66..3c6364532a 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -18,14 +18,14 @@
 
 */
 
-#ifndef __ardour_smf_filesource_h__ 
-#define __ardour_smf_filesource_h__
+#ifndef __ardour_smf_source_h__
+#define __ardour_smf_source_h__
 
 #include <cstdio>
 #include <time.h>
-
-#include <ardour/midi_source.h>
-#include <evoral/SMF.hpp>
+#include "evoral/SMF.hpp"
+#include "ardour/midi_source.h"
+#include "ardour/file_source.h"
 
 namespace Evoral { template<typename T> class Event; }
 
@@ -34,100 +34,61 @@ namespace ARDOUR {
 template<typename T> class MidiRingBuffer;
 
 /** Standard Midi File (Type 0) Source */
-class SMFSource : public MidiSource, public Evoral::SMF<double> {
-  public:
-	enum Flag {
-		Writable = 0x1,
-		CanRename = 0x2,
-		Broadcast = 0x4,
-		Removable = 0x8,
-		RemovableIfEmpty = 0x10,
-		RemoveAtDestroy = 0x20,
-		BuildPeaks = 0x40
-	};
-	
+class SMFSource : public MidiSource, public FileSource, public Evoral::SMF {
+public:
 	/** Constructor for existing external-to-session files */
-	SMFSource (Session& session, std::string path, Flag flags = Flag(0));
+	SMFSource (Session& session, const Glib::ustring& path, bool embedded,
+			Source::Flag flags = Source::Flag(0));
 
-	/* Constructor for existing in-session files */
-	SMFSource (Session& session, const XMLNode&);
+	/** Constructor for existing in-session files */
+	SMFSource (Session& session, const XMLNode&, bool must_exist = false);
 
 	virtual ~SMFSource ();
 
-	/* this block of methods do nothing for regular file sources, but are significant
-	   for files used in destructive recording.
-	*/
-	// FIXME and thus are useless for MIDI.. but make MidiDiskstream compile easier! :)
-
-	virtual nframes_t last_capture_start_frame() const { return 0; }
-	virtual void      mark_capture_start (nframes_t) {}
-	virtual void      mark_capture_end () {}
-	virtual void      clear_capture_marks() {}
+	bool safe_file_extension (const Glib::ustring& path) const {
+		return safe_midi_file_extension(path);
+	}
 
 	bool set_name (const std::string& newname) { return (set_source_name(newname, false) == 0); }
-	int set_source_name (string newname, bool destructive);
-	
-	static bool safe_file_extension (const Glib::ustring& path);
-	
-	Glib::ustring path() const { return _path; }
-
-	void set_allow_remove_if_empty (bool yn);
-	void mark_for_remove();
 
-	void append_event_unlocked(EventTimeUnit unit, const Evoral::Event<double>& ev);
+	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);
 
-	int move_to_trash (const string trash_dir_name);
-
-	void mark_streaming_midi_write_started (NoteMode mode, nframes_t start_time);
+	void mark_streaming_midi_write_started (NoteMode mode, sframes_t start_time);
 	void mark_streaming_write_completed ();
 
-	void   mark_take (string);
-	string take_id() const { return _take_id; }
-
-	static void set_search_path (string);
-	static void set_header_position_offset (nframes_t offset, bool negative);
-
 	XMLNode& get_state ();
-	int set_state (const XMLNode&);
-
-	void load_model(bool lock=true, bool force_reload=false);
-	void destroy_model();
+	int set_state (const XMLNode&, int version = 3000);
 
-	double last_event_time() const { return _last_ev_time; }
+	void load_model (bool lock=true, bool force_reload=false);
+	void destroy_model ();
 
-	void flush_midi();
+	void flush_midi ();
 
-  private:
+	static void set_header_position_offset (nframes_t offset, bool negative);
 
-	int init (string idstr, bool must_exist);
+	static bool safe_midi_file_extension (const Glib::ustring& path);
 
-	nframes_t read_unlocked (
-			MidiRingBuffer<nframes_t>& dst,
-			nframes_t start,
-			nframes_t cn,
-			nframes_t stamp_offset,
-			nframes_t negative_stamp_offset) const;
+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;
 
-	nframes_t write_unlocked (
-			MidiRingBuffer<nframes_t>& src,
+	nframes_t write_unlocked (MidiRingBuffer<nframes_t>& src,
+			sframes_t position,
 			nframes_t cnt);
 
-	bool find (std::string path, bool must_exist, bool& is_new);
-	bool removable() const;
-	bool writable() const { return _flags & Writable; }
-	
-	void set_default_controls_interpolation();
-
-	Glib::ustring  _path;
-	Flag           _flags;
-	string         _take_id;
-	bool           _allow_remove_if_empty;
-	double         _last_ev_time;
+	void set_default_controls_interpolation ();
 
-	static string _search_path;
+	double    _last_ev_time_beats;
+	sframes_t _last_ev_time_frames;
+	mutable sframes_t _smf_last_read_end;
 };
 
 }; /* namespace ARDOUR */
 
-#endif /* __ardour_smf_filesource_h__ */
+#endif /* __ardour_smf_source_h__ */