/*
- 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
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/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)
{
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)
{
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
SessionDirectory::sound_path () const
{
if(is_directory (old_sound_path ())) return old_sound_path();
// the new style sound directory
- return m_root_path / interchange_dir_name / m_root_path.leaf() / sound_dir_name;
+ return sources_root() / sound_dir_name;
}
const path
SessionDirectory::midi_path () const
{
- // the new style sound directory
- return m_root_path / interchange_dir_name / m_root_path.leaf() / midi_dir_name;
+ return sources_root() / midi_dir_name;
+}
+
+const path
+SessionDirectory::midi_patch_path () const
+{
+ return sources_root() / midi_patch_dir_name;
}
const path
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 ( midi_path () );