a better fix for CUE/TOC string escaping: if the text is not Latin-1 already, reject...

[ardour.git] / libs / ardour / session_directory.cc

diff --git a/libs/ardour/session_directory.cc b/libs/ardour/session_directory.cc
index 91b2587eb722abcf65d315bcddb7a13c751bd82d..9653a15ae10b07c60f036ca5f7b9fe628e640000 100644 (file)
--- a/libs/ardour/session_directory.cc
+++ b/libs/ardour/session_directory.cc
@@ -1,5 +1,5 @@
 /*
-       Copyright (C) 2007 Tim Mayberry 
+       Copyright (C) 2007 Tim Mayberry
 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
@@ -16,30 +16,34 @@
        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <cerrno>
+#include "pbd/error.h"
+#include "pbd/compose.h"
+#include "pbd/filesystem.h"
 
-#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/directory_names.h"
+#include "ardour/session_directory.h"
+#include "ardour/utils.h"
 
 #include "i18n.h"
 
 namespace ARDOUR {
 
+using namespace std;
 using namespace PBD::sys;
 
-SessionDirectory::SessionDirectory (const string& session_path)
+SessionDirectory::SessionDirectory (const path& session_path)
        : m_root_path(session_path)
 {
 
 }
 
+SessionDirectory& 
+SessionDirectory::operator= (const std::string& newpath)
+{
+       m_root_path = newpath;
+       return *this;
+}
+
 bool
 SessionDirectory::create ()
 {
@@ -50,10 +54,7 @@ SessionDirectory::create ()
        {
                try
                {
-                       if(create_directories(*i)) {
-                               PBD::info << string_compose(_("Created Session directory at path %1"), (*i).to_string()) << endmsg;
-                               is_new = true;
-                       }
+                       if(create_directories(*i)) is_new = true;
                }
                catch (PBD::sys::filesystem_error& ex)
                {
@@ -87,7 +88,21 @@ 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
+{
+       path p = m_root_path;
+
+       if (p.leaf() == ".") {
+               p = PBD::sys::get_absolute_path (m_root_path);
+       }
+       
+       const string legalized_root (legalize_for_path (p.leaf ()));
+
+       return m_root_path / interchange_dir_name / legalized_root;
 }
 
 const path
@@ -96,42 +111,49 @@ 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);
+       return sources_root() / sound_dir_name;
+}
 
-       l_sound_path /= interchange_dir_name;
-       l_sound_path /= basename(m_root_path);
-       l_sound_path /= sound_dir_name;
+const path
+SessionDirectory::midi_path () const
+{
+       return sources_root() / midi_dir_name;
+}
 
-       return l_sound_path;
+const path
+SessionDirectory::midi_patch_path () const
+{
+       return sources_root() / midi_patch_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
+SessionDirectory::dead_path () const
 {
-       return path(m_root_path) /= dead_sound_dir_name;
+       return m_root_path / dead_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>
 SessionDirectory::sub_directories () const
 {
-       vector<path> tmp_paths; 
+       vector<path> tmp_paths;
 
-       tmp_paths.push_back ( sound_path () );
-       tmp_paths.push_back ( peak_path () );
-       tmp_paths.push_back ( dead_sound_path () );
-       tmp_paths.push_back ( export_path () );
+       tmp_paths.push_back (sound_path ());
+       tmp_paths.push_back (midi_path ());
+       tmp_paths.push_back (peak_path ());
+       tmp_paths.push_back (dead_path ());
+       tmp_paths.push_back (export_path ());
 
        return tmp_paths;
 }