ardour/livetrax
13
0
Fork 0
Code

Remove use of pbd/filesystem.h in SessionDirectory, use Glib equivalents

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12878 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2012-06-23 05:08:51 +00:00
parent 7a6e86c9f9
commit 1844c8b422
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/ardour/session_directory.cc
View File

@ -22,7 +22,6 @@
#include "pbd/error.h"
#include "pbd/compose.h"
#include "pbd/file_utils.h"
#include "pbd/filesystem.h"
#include "ardour/directory_names.h"
#include "ardour/session_directory.h"
@ -94,17 +93,17 @@ SessionDirectory::old_sound_path () const
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() == ".") {
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