X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ffile_source.cc;h=dc582a36ee0c2ba20b0de6ae7606b5b8b3a7a482;hb=b65f8073ba306ac2d85133875746767e7c6b0eb6;hp=649fc6156b5bf641f33ae3a4e74120c2e58ae98f;hpb=c9582da23371bfd40f3087f5a9112d081ef012da;p=ardour.git

diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc
index 649fc6156b..dc582a36ee 100644
--- a/libs/ardour/file_source.cc
+++ b/libs/ardour/file_source.cc
@@ -26,26 +26,27 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <pbd/convert.h>
-#include <pbd/basename.h>
-#include <pbd/mountpoint.h>
-#include <pbd/stl_delete.h>
-#include <pbd/strsplit.h>
-#include <pbd/shortpath.h>
-#include <pbd/enumwriter.h>
+#include "pbd/convert.h"
+#include "pbd/basename.h"
+#include "pbd/mountpoint.h"
+#include "pbd/stl_delete.h"
+#include "pbd/strsplit.h"
+#include "pbd/shortpath.h"
+#include "pbd/enumwriter.h"
 
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 #include <glibmm/thread.h>
 
-#include <ardour/file_source.h>
-#include <ardour/session.h>
-#include <ardour/session_directory.h>
-#include <ardour/source_factory.h>
-#include <ardour/filename_extensions.h>
+#include "ardour/file_source.h"
+#include "ardour/session.h"
+#include "ardour/session_directory.h"
+#include "ardour/source_factory.h"
+#include "ardour/filename_extensions.h"
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Glib;
@@ -64,7 +65,7 @@ FileSource::FileSource (Session& session, DataType type,
 {
 }
 
-FileSource::FileSource (Session& session, const XMLNode& node, bool must_exist)
+FileSource::FileSource (Session& session, const XMLNode& node, bool /*must_exist*/)
 	: Source(session, node)
 	, _file_is_new(false)
 {
@@ -85,10 +86,16 @@ FileSource::init (const ustring& pathstr, bool must_exist)
 {
 	_timeline_position = 0;
 
-	if (!find (_type, pathstr, must_exist, _file_is_new, _channel)) {
+	if (!find (_type, pathstr, must_exist, _file_is_new, _channel, _path)) {
 		throw MissingSource ();
 	}
 
+	/* XXX is this necessary? or even wise? */
+
+	if (_is_embedded) {
+		_name = Glib::path_get_basename (_name);
+	}
+
 	if (_file_is_new && must_exist) {
 		return -1;
 	}
@@ -187,15 +194,16 @@ FileSource::move_to_trash (const ustring& trash_dir_name)
 	return 0;
 }
 
-/** Find the actual source file based on \a path.
+/** Find the actual source file based on \a filename.
  * 
- * If the source is embedded, \a path should be a filename (no slashes).
- * If the source is external, \a path should be a full path.
- * In either case, _path is set to the complete absolute path of the source file.
+ * If the source is embedded, \a filename should be a simple filename (no slashes).
+ * If the source is external, \a filename should be a full path.
+ * In either case, found_path is set to the complete absolute path of the source file.
  * \return true iff the file was found.
  */
 bool
-FileSource::find (DataType type, const ustring& path, bool must_exist, bool& isnew, uint16_t& chan)
+FileSource::find (DataType type, const ustring& path, bool must_exist,
+		  bool& isnew, uint16_t& chan, ustring& found_path)
 {
 	Glib::ustring search_path = search_paths[type];
 
@@ -313,7 +321,7 @@ FileSource::find (DataType type, const ustring& path, bool must_exist, bool& isn
 			}
 		}
 
-		_path = keeppath;
+		found_path = keeppath;
 		
 		ret = true;
 
@@ -333,7 +341,7 @@ FileSource::find (DataType type, const ustring& path, bool must_exist, bool& isn
 			}
 		}
 		
-		_path = pathstr;
+		found_path = pathstr;
 
 		if (!Glib::file_test (pathstr, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
 
@@ -342,14 +350,14 @@ FileSource::find (DataType type, const ustring& path, bool must_exist, bool& isn
 			if (must_exist) {
 				error << string_compose(
 						_("Filesource: cannot find required file (%1): %2"),
-						_path, strerror (errno)) << endmsg;
+						path, strerror (errno)) << endmsg;
 				goto out;
 			}
 			
 			if (errno != ENOENT) {
 				error << string_compose(
 						_("Filesource: cannot check for existing file (%1): %2"),
-						_path, strerror (errno)) << endmsg;
+						path, strerror (errno)) << endmsg;
 				goto out;
 			}
 			
@@ -364,10 +372,6 @@ FileSource::find (DataType type, const ustring& path, bool must_exist, bool& isn
 		}
 	}
 	
-	if (_is_embedded) {
-		_name = Glib::path_get_basename (_name);
-	}
-	
 out:
 	return ret;
 }