X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ffile_source.cc;h=3ec561d66718f103db1dd1ed7c3d56619676e3c9;hb=83ead9ccbb36d2a941df90f2a26aa4f3aea49615;hp=109539ce2d7539fe242861a0d189b6e55e5f701b;hpb=5399425f534e2d96d07cf29f427bfa0f39d904b7;p=ardour.git

diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc
index 109539ce2d..3ec561d667 100644
--- a/libs/ardour/file_source.cc
+++ b/libs/ardour/file_source.cc
@@ -56,10 +56,9 @@ PBD::Signal2<int,std::string,std::vector<std::string> > FileSource::AmbiguousFil
 FileSource::FileSource (Session& session, DataType type, const string& path, const string& origin, Source::Flag flag)
 	: Source(session, type, path, flag)
 	, _path (path)
-	, _file_is_new (!origin.empty()) // origin empty => new file VS. origin !empty => new file
+	, _file_is_new (!origin.empty()) // if origin is left unspecified (empty string) then file must exist
 	, _channel (0)
-        , _origin (origin)
-        , _open (false)
+	, _origin (origin)
 {
 	set_within_session_from_path (path);
 }
@@ -67,6 +66,7 @@ FileSource::FileSource (Session& session, DataType type, const string& path, con
 FileSource::FileSource (Session& session, const XMLNode& node, bool /*must_exist*/)
 	: Source (session, node)
 	, _file_is_new (false)
+	, _channel (0)
 {
 	/* this setting of _path is temporary - we expect derived classes
 	   to call ::init() which will actually locate the file
@@ -148,9 +148,9 @@ FileSource::set_state (const XMLNode& node, int /*version*/)
 		_channel = 0;
 	}
 
-        if ((prop = node.property (X_("origin"))) != 0) {
-                _origin = prop->value();
-        }
+	if ((prop = node.property (X_("origin"))) != 0) {
+		_origin = prop->value();
+	}
 
 	return 0;
 }
@@ -214,7 +214,7 @@ FileSource::move_to_trash (const string& trash_dir_name)
 
 	if (move_dependents_to_trash() != 0) {
 		/* try to back out */
-		rename (newpath.c_str(), _path.c_str());
+		::rename (newpath.c_str(), _path.c_str());
 		return -1;
 	}
 
@@ -252,8 +252,6 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist
                         goto out;
                 }
 
-                hits.clear ();
-
                 for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
 
                         fullpath = Glib::build_filename (*i, path);
@@ -276,7 +274,7 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist
 
 			vector<string>::iterator j = i;
 			++j;
-			
+
 			while (j != hits.end()) {
 				if (PBD::equivalent_paths (*i, *j)) {
 					/* *i and *j are the same file; break out of the loop early */
@@ -308,8 +306,9 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist
 			/* no match: error */
 
                         if (must_exist) {
-                                error << string_compose(
-                                        _("Filesource: cannot find required file (%1)"), path) << endmsg;
+				/* do not generate an error here, leave that to
+				   whoever deals with the false return value.
+				*/
                                 goto out;
                         } else {
                                 isnew = true;
@@ -317,19 +316,20 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist
                 } else {
 
 			/* only one match: happy days */
-			
+
 			keeppath = de_duped_hits[0];
 		}
-						  
-        } else {
+
+       } else {
                 keeppath = path;
         }
 
         /* Current find() is unable to parse relative path names to yet non-existant
            sources. QuickFix(tm)
         */
-        if (keeppath == "") {
-                if (must_exist) {
+
+	if (keeppath.empty()) {
+		if (must_exist) {
                         error << "FileSource::find(), keeppath = \"\", but the file must exist" << endl;
                 } else {
                         keeppath = path;
@@ -337,7 +337,6 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist
         }
 
         found_path = keeppath;
-
         ret = true;
 
   out:
@@ -545,7 +544,14 @@ FileSource::set_within_session_from_path (const std::string& path)
 void
 FileSource::set_path (const std::string& newpath)
 {
+	close ();
         _path = newpath;
+	set_within_session_from_path (newpath);
+	if (_within_session) {
+		_origin = Glib::path_get_basename (newpath);
+	} else {
+		_origin = newpath;
+	}
 }
 
 void
@@ -560,7 +566,7 @@ FileSource::is_stub () const
 	if (!empty()) {
 		return false;
 	}
-	
+
 	if (!removable()) {
 		return false;
 	}
@@ -571,4 +577,31 @@ FileSource::is_stub () const
 
 	return true;
 }
-		
+
+int
+FileSource::rename (const string& newpath)
+{
+	Glib::Threads::Mutex::Lock lm (_lock);
+	string oldpath = _path;
+
+	// Test whether newpath exists, if yes notify the user but continue.
+	if (Glib::file_test (newpath, Glib::FILE_TEST_EXISTS)) {
+		error << string_compose (_("Programming error! %1 tried to rename a file over another file! It's safe to continue working, but please report this to the developers."), PROGRAM_NAME) << endmsg;
+		return -1;
+	}
+
+	if (Glib::file_test (oldpath.c_str(), Glib::FILE_TEST_EXISTS)) {
+		/* rename only needed if file exists on disk */
+		if (::rename (oldpath.c_str(), newpath.c_str()) != 0) {
+			error << string_compose (_("cannot rename file %1 to %2 (%3)"), oldpath, newpath, strerror(errno)) << endmsg;
+			return -1;
+		}
+	}
+
+	_name = Glib::path_get_basename (newpath);
+	_path = newpath;
+
+	return 0;
+}
+
+