diff options
| author | Robin Gareus <robin@gareus.org> | 2014-02-26 17:24:38 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-02-26 18:07:45 +0100 |
| commit | ce32d5f17b67a4c73105138b8dbe9ee2edf8dede (patch) | |
| tree | d57df1767b60b993b4caf57a2df4f3b7f554ab60 /libs | |
| parent | 35272b8c47fa3dd074f2fb89a5f0ff3c883dbcef (diff) | |
make PBD's path-scanner OS agnostic (use glib)
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/pbd/pathscanner.cc | 2 | ||||
| -rw-r--r-- | libs/pbd/search_path.cc | 14 |
2 files changed, 3 insertions, 13 deletions
diff --git a/libs/pbd/pathscanner.cc b/libs/pbd/pathscanner.cc index b9b501a120..a064fdbc03 100644 --- a/libs/pbd/pathscanner.cc +++ b/libs/pbd/pathscanner.cc @@ -106,7 +106,7 @@ PathScanner::run_scan_internal (vector<string *> *result, string *newstr; long nfound = 0; - if ((thisdir = strtok (pathcopy, ":")) == 0 || + if ((thisdir = strtok (pathcopy, G_SEARCHPATH_SEPARATOR_S)) == 0 || strlen (thisdir) == 0) { free (pathcopy); return 0; diff --git a/libs/pbd/search_path.cc b/libs/pbd/search_path.cc index ea08785f68..0106881f84 100644 --- a/libs/pbd/search_path.cc +++ b/libs/pbd/search_path.cc @@ -25,16 +25,6 @@ using namespace std; -namespace { - -#ifdef PLATFORM_WINDOWS -const char * const path_delimiter = ";"; -#else -const char * const path_delimiter = ":"; -#endif - -} - namespace PBD { Searchpath::Searchpath () @@ -46,7 +36,7 @@ Searchpath::Searchpath (const string& path) { vector<std::string> tmp; - if (tokenize (path, string(path_delimiter), std::back_inserter (tmp))) { + if (tokenize (path, string(G_SEARCHPATH_SEPARATOR_S), std::back_inserter (tmp))) { add_directories (tmp); } } @@ -79,7 +69,7 @@ Searchpath::to_string () const for (vector<std::string>::const_iterator i = begin(); i != end(); ++i) { path += *i; - path += path_delimiter; + path += G_SEARCHPATH_SEPARATOR; } path = path.substr (0, path.length() - 1); // drop final separator |