X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_directory.cc;h=1a2b476cad5df8d6c6db74c5e76f2b01beabe56b;hb=1059b3f48e568b60d5e248d94fbb9110a2dd1a16;hp=9d94b2228ec296ac88a397e0317152dd7b69cac3;hpb=d8d24a7521853c9f3610f7a02e4197ac8fa3a3eb;p=ardour.git

diff --git a/libs/ardour/session_directory.cc b/libs/ardour/session_directory.cc
index 9d94b2228e..1a2b476cad 100644
--- a/libs/ardour/session_directory.cc
+++ b/libs/ardour/session_directory.cc
@@ -16,17 +16,13 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <cerrno>
-
-#include <glibmm/fileutils.h>
-#include <glibmm/miscutils.h>
-
 #include <pbd/error.h>
 #include <pbd/compose.h>
 #include <pbd/filesystem.h>
 
 #include <ardour/directory_names.h>
 #include <ardour/session_directory.h>
+#include <ardour/utils.h>
 
 #include "i18n.h"
 
@@ -87,7 +83,15 @@ SessionDirectory::is_valid () const
 const path
 SessionDirectory::old_sound_path () const
 {
-	return path(m_root_path) /= old_sound_dir_name;
+	return m_root_path / old_sound_dir_name;
+}
+
+const path
+SessionDirectory::sources_root () const
+{
+	const string legalized_root(legalize_for_path(m_root_path.leaf()));
+
+	return m_root_path / interchange_dir_name / legalized_root;
 }
 
 const path
@@ -96,50 +100,37 @@ SessionDirectory::sound_path () const
 	if(is_directory (old_sound_path ())) return old_sound_path();
 
 	// the new style sound directory
-	path l_sound_path(m_root_path);
-
-	l_sound_path /= interchange_dir_name;
-	l_sound_path /= m_root_path.leaf();
-	l_sound_path /= sound_dir_name;
-
-	return l_sound_path;
+	return sources_root() / sound_dir_name;
 }
 
 const path
 SessionDirectory::midi_path () const
 {
-	// the new style sound directory
-	path l_midi_path(m_root_path);
-
-	l_midi_path /= interchange_dir_name;
-	l_midi_path /= m_root_path.leaf();
-	l_midi_path /= midi_dir_name;
-
-	return l_midi_path;
+	return sources_root() / midi_dir_name;
 }
 
 const path
 SessionDirectory::peak_path () const
 {
-	return path(m_root_path) /= peak_dir_name;
+	return m_root_path / peak_dir_name;
 }
 
 const path
 SessionDirectory::dead_sound_path () const
 {
-	return path(m_root_path) /= dead_sound_dir_name;
+	return m_root_path / dead_sound_dir_name;
 }
 
 const path
 SessionDirectory::dead_midi_path () const
 {
-	return path(m_root_path) /= dead_midi_dir_name;
+	return m_root_path / dead_midi_dir_name;
 }
 
 const path
 SessionDirectory::export_path () const
 {
-	return path(m_root_path) /= export_dir_name;
+	return m_root_path / export_dir_name;
 }
 
 const vector<path>