Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <cerrno>
+
#include <glibmm/fileutils.h>
#include <glibmm/miscutils.h>
#include "pbd/error.h"
#include "pbd/compose.h"
-#include "pbd/filesystem.h"
+#include "pbd/file_utils.h"
#include "ardour/directory_names.h"
#include "ardour/session_directory.h"
bool
SessionDirectory::create ()
{
- bool is_new = false;
-
vector<std::string> sub_dirs = sub_directories ();
for (vector<std::string>::const_iterator i = sub_dirs.begin(); i != sub_dirs.end(); ++i)
{
- if (Glib::file_test (*i, Glib::FILE_TEST_EXISTS)) {
- is_new = false;
- }
-
if (g_mkdir_with_parents (i->c_str(), 0755) != 0) {
PBD::error << string_compose(_("Cannot create Session directory at path %1 Error: %2"), *i, g_strerror(errno)) << endmsg;
-
+ return false;
}
}
- return is_new;
+ return true;
}
bool
const std::string
SessionDirectory::sources_root () const
{
- // fix this later
- path p = m_root_path;
+ std::string p = m_root_path;
+ std::string filename = Glib::path_get_basename(p);
- if (p.leaf() == ".") {
- p = PBD::sys::get_absolute_path (m_root_path);
+ if (filename == ".") {
+ p = PBD::get_absolute_path (m_root_path);
}
- const string legalized_root (legalize_for_path (p.leaf ()));
+ const string legalized_root (legalize_for_path (Glib::path_get_basename(p)));
- 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);
}
const std::string
return Glib::build_filename (sources_root(), sound_dir_name);
}
+const std::string
+SessionDirectory::sound_path_2X () const
+{
+ return Glib::build_filename (sources_root_2X(), sound_dir_name);
+}
+
const std::string
SessionDirectory::midi_path () const
{
return Glib::build_filename (sources_root(), midi_patch_dir_name);
}
+const std::string
+SessionDirectory::video_path () const
+{
+ return Glib::build_filename (sources_root(), video_dir_name);
+}
+
const std::string
SessionDirectory::peak_path () const
{