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, 8 insertions, 10 deletions

diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index acb03391a4..5154a7a80c 100644
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -29,17 +29,15 @@ namespace ARDOUR {
 
 class SndFileSource : public AudioFileSource {
   public:
-	/* constructor to be called for existing external-to-session files */
+	/** Constructor to be called for existing external-to-session files */
+	SndFileSource (Session&, const Glib::ustring& path, bool embedded, int chn, Flag flags);
 
-        SndFileSource (Session&, Glib::ustring path, int chn, Flag flags);
-
-	/* constructor to be called for new in-session files */
-
-	SndFileSource (Session&, Glib::ustring path, SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate, 
-		       Flag flags = SndFileSource::default_writable_flags);
+	/* Constructor to be called for new in-session files */
+	SndFileSource (Session&, const Glib::ustring& path, bool embedded,
+			SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate, 
+			Flag flags = SndFileSource::default_writable_flags);
 		       
-	/* constructor to be called for existing in-session files */
-	
+	/** Constructor to be called for existing in-session files */
 	SndFileSource (Session&, const XMLNode&);
 
 	~SndFileSource ();
@@ -77,7 +75,7 @@ class SndFileSource : public AudioFileSource {
 	SF_INFO _info;
 	BroadcastInfo *_broadcast_info;
 
-	void init ();
+	void init_sndfile ();
 	int open();
 	int setup_broadcast_info (nframes_t when, struct tm&, time_t);