Fix the horrible mess that was anything related to sources and paths.

Most significant changes:

 - Factor out FileSource from AudioFileSource, use for SMFSource too
 - Explicitly pass embedded rather than mysterious name mangling or whatever
 - Destroy a ton of duplicated or very-nearly-duplicated code
 - Clean up and document all that weird source stuff in session.cc


git-svn-id: svn://localhost/ardour2/branches/3.0@4609 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 27 insertions, 45 deletions

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index 4855cb6e31..259328c5fa 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 <ardour/midi_source.h>
+#include <ardour/file_source.h>
 
 namespace Evoral { template<typename T> class Event; }
 
@@ -34,51 +34,42 @@ namespace ARDOUR {
 template<typename T> class MidiRingBuffer;
 
 /** Standard Midi File (Type 0) Source */
-class SMFSource : public MidiSource, public Evoral::SMF {
-  public:
+class SMFSource : public MidiSource, public FileSource, public Evoral::SMF {
+public:
 	/** Constructor for existing external-to-session files */
-	SMFSource (Session& session, std::string path, Source::Flag flags = Source::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 ();
-
-	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; }
+	bool safe_file_extension (const Glib::ustring& path) const {
+		return safe_midi_file_extension(path);
+	}
 
-	void set_allow_remove_if_empty (bool yn);
-	void mark_for_remove();
+	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);
-
-	int move_to_trash (const string trash_dir_name);
+	void append_event_unlocked_beats (const Evoral::Event<double>& ev);
+	void append_event_unlocked_frames (const Evoral::Event<nframes_t>& ev);
 
 	void mark_streaming_midi_write_started (NoteMode mode, nframes_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();
+	void load_model (bool lock=true, bool force_reload=false);
+	void destroy_model ();
 
-	void flush_midi();
+	void flush_midi ();
+	
+	static void set_header_position_offset (nframes_t offset, bool negative);
 
-  private:
-	int init (string idstr, bool must_exist);
+	static bool safe_midi_file_extension (const Glib::ustring& path);
 
+private:
 	nframes_t read_unlocked (
 			MidiRingBuffer<nframes_t>& dst,
 			nframes_t start,
@@ -90,22 +81,13 @@ class SMFSource : public MidiSource, public Evoral::SMF {
 			MidiRingBuffer<nframes_t>& src,
 			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;
-	string         _take_id;
-	bool           _allow_remove_if_empty;
-	double         _last_ev_time_beats;
-	nframes_t      _last_ev_time_frames;
+	void set_default_controls_interpolation ();
 
-	static string _search_path;
+	double    _last_ev_time_beats;
+	nframes_t _last_ev_time_frames;
 };
 
 }; /* namespace ARDOUR */
 
-#endif /* __ardour_smf_filesource_h__ */
+#endif /* __ardour_smf_source_h__ */