diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:08:14 +0000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:08:14 +0000 |
| commit | e26e59b00634d5a66f39e40dea71d56a8dea0f2a (patch) | |
| tree | 2fa3c913ba58d1189fb97d6057508e2566631475 /libs/ardour | |
| parent | 6aee53710916320742370354c0867004166c6dab (diff) | |
Move three file utility functions from pbd/filesystem.h to pbd/file_utils.h
git-svn-id: svn://localhost/ardour2/branches/3.0@12863 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/file_source.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session_directory.cc | 3 | ||||
| -rw-r--r-- | libs/ardour/session_state.cc | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc index ba2b809dbe..2f7ad2caa8 100644 --- a/libs/ardour/file_source.cc +++ b/libs/ardour/file_source.cc @@ -32,7 +32,7 @@ #include "pbd/strsplit.h" #include "pbd/shortpath.h" #include "pbd/enumwriter.h" -#include "pbd/filesystem.h" +#include "pbd/file_utils.h" #include <glibmm/miscutils.h> #include <glibmm/fileutils.h> @@ -277,7 +277,7 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist ++j; while (j != hits.end()) { - if (PBD::sys::equivalent_paths (*i, *j)) { + if (PBD::equivalent_paths (*i, *j)) { /* *i and *j are the same file; break out of the loop early */ break; } diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index ed90bccb7f..271bb406b0 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -4528,7 +4528,7 @@ Session::ensure_search_path_includes (const string& path, DataType type) On Windows, I think we could just do if (*i == path) here. */ - if (PBD::sys::equivalent_paths (*i, path)) { + if (PBD::equivalent_paths (*i, path)) { return; } } diff --git a/libs/ardour/session_directory.cc b/libs/ardour/session_directory.cc index fca3950669..6eacc8a814 100644 --- a/libs/ardour/session_directory.cc +++ b/libs/ardour/session_directory.cc @@ -21,6 +21,7 @@ #include "pbd/error.h" #include "pbd/compose.h" +#include "pbd/file_utils.h" #include "pbd/filesystem.h" #include "ardour/directory_names.h" @@ -97,7 +98,7 @@ SessionDirectory::sources_root () const path p = m_root_path; if (p.leaf() == ".") { - p = PBD::sys::get_absolute_path (m_root_path); + p = PBD::get_absolute_path (m_root_path); } const string legalized_root (legalize_for_path (p.leaf ())); diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 58a3d1075b..1305653c54 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -435,7 +435,7 @@ bool Session::path_is_within_session (const std::string& path) { for (vector<space_and_path>::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) { - if (PBD::sys::path_is_within (i->path, path)) { + if (PBD::path_is_within (i->path, path)) { return true; } } |