splash screen fix from nedko ; fix cleanup's failure to correctly locate files listed in XML nodes ; Route::set_name() doesn't need to be virtual ; minor text alterations

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5268 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 12 insertions, 5 deletions

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index f8e12e07b8..6e13e3977f 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -2626,12 +2626,17 @@ Session::find_all_sources (string path, set<string>& result)
 			continue;
 		}
 
-		string path = _path; /* /-terminated */
-		path += sound_dir_name;
-		path += '/';
-		path += prop->value();
+		/* now we have to actually find the file */
 
-		result.insert (path);
+		bool is_new;
+		uint16_t chan;
+		Glib::ustring path;
+		std::string name;
+		
+		if (AudioFileSource::find (prop->value(), true, false, is_new, chan, path, name)) {
+			cerr << "Got " << path << " from XML source with prop = " << prop->value() << endl;
+			result.insert (path);
+		}
 	}
 
 	return 0;
@@ -2819,6 +2824,8 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 			realpath(spath.c_str(), tmppath1);
 			realpath((*i).c_str(),  tmppath2);
 
+			cerr << "comparing " << tmppath1 << " and " << tmppath2 << endl;
+
 			if (strcmp(tmppath1, tmppath2) == 0) {
 				used = true;
 				break;