- path sources_root_path = m_root_path / interchange_dir_name / legalized_root;
- return sources_root_path.to_string ();
+ std::string sources_root_path = Glib::build_filename (m_root_path, interchange_dir_name);
+ return Glib::build_filename (sources_root_path, legalized_root);
+}
+
+const std::string
+SessionDirectory::sources_root_2X () const
+{
+ std::string p = m_root_path;
+ std::string filename = Glib::path_get_basename(p);
+
+ if (filename == ".") {
+ p = PBD::get_absolute_path (m_root_path);
+ }
+
+ const string legalized_root (legalize_for_path_2X (Glib::path_get_basename(p)));
+
+ std::string sources_root_path = Glib::build_filename (m_root_path, interchange_dir_name);
+ return Glib::build_filename (sources_root_path, legalized_root);