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)
{
{
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)
{
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
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 /= basename(m_root_path);
- 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 /= basename(m_root_path);
- l_midi_path /= midi_dir_name;
+ return sources_root() / midi_dir_name;
+}
- return l_midi_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
{
- 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 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>
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 () );
return tmp_paths;