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 d5f2ddc1ba2311f2ae2f3caf08f794ed480c1d13..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,18 +16,19 @@
        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <pbd/error.h>
-#include <pbd/compose.h>
-#include <pbd/filesystem.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 "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 path& session_path)
@@ -36,6 +37,13 @@ SessionDirectory::SessionDirectory (const path& session_path)
 
 }
 
+SessionDirectory& 
+SessionDirectory::operator= (const std::string& newpath)
+{
+       m_root_path = newpath;
+       return *this;
+}
+
 bool
 SessionDirectory::create ()
 {
@@ -86,7 +94,13 @@ SessionDirectory::old_sound_path () const
 const path
 SessionDirectory::sources_root () const
 {
-       const string legalized_root(legalize_for_path(m_root_path.leaf()));
+       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;
 }
@@ -107,21 +121,21 @@ SessionDirectory::midi_path () const
 }
 
 const path
-SessionDirectory::peak_path () const
+SessionDirectory::midi_patch_path () const
 {
-       return m_root_path / peak_dir_name;
+       return sources_root() / midi_patch_dir_name;
 }
 
 const path
-SessionDirectory::dead_sound_path () const
+SessionDirectory::peak_path () const
 {
-       return m_root_path / dead_sound_dir_name;
+       return m_root_path / peak_dir_name;
 }
 
 const path
-SessionDirectory::dead_midi_path () const
+SessionDirectory::dead_path () const
 {
-       return m_root_path / dead_midi_dir_name;
+       return m_root_path / dead_dir_name;
 }
 
 const path
@@ -133,14 +147,13 @@ SessionDirectory::export_path () const
 const vector<path>
 SessionDirectory::sub_directories () const
 {
-       vector<path> tmp_paths; 
-
-       tmp_paths.push_back ( sound_path () );
-       tmp_paths.push_back ( midi_path () );
-       tmp_paths.push_back ( peak_path () );
-       tmp_paths.push_back ( dead_sound_path () );
-       tmp_paths.push_back ( dead_midi_path () );
-       tmp_paths.push_back ( export_path () );
+       vector<path> tmp_paths;
+
+       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;
 }