smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 05:35:47 +01:00
Code Issues Projects Releases Wiki Activity

Use std::string instead of PBD::sys::path in pbd/search_path.h, pbd/file_utils.h and ardour/session_dir.h

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12829 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2012-06-23 05:06:54 +00:00
parent 22e478e7fc
commit 105caf23da
54 changed files with 255 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libs/ardour/filesystem_paths.cc
View file

@ -22,6 +22,7 @@
#include "pbd/error.h"
#include "pbd/compose.h"
#include "pbd/strsplit.h"
#include "pbd/filesystem.h"
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
@ -37,7 +38,7 @@ namespace ARDOUR {
using std::string;
sys::path
std::string
user_config_directory ()
{
sys::path p;
@ -87,10 +88,10 @@ user_config_directory ()
exit (1);
}
return p;
return p.to_string();
}
sys::path
std::string
ardour_dll_directory ()
{
std::string s = Glib::getenv("ARDOUR_DLL_PATH");
@ -98,7 +99,7 @@ ardour_dll_directory ()
std::cerr << _("ARDOUR_DLL_PATH not set in environment - exiting\n");
::exit (1);
}
return sys::path (s);
return s;
}
SearchPath
@ -119,7 +120,7 @@ ardour_config_search_path ()
std::vector<string> ss;
split (s, ss, ':');
for (std::vector<string>::iterator i = ss.begin(); i != ss.end(); ++i) {
sp += sys::path (*i);
sp += *i;
}
search_path = sp;
@ -147,7 +148,7 @@ ardour_data_search_path ()
std::vector<string> ss;
split (s, ss, ':');
for (std::vector<string>::iterator i = ss.begin(); i != ss.end(); ++i) {
sp += sys::path (*i);
sp += *i;
}
search_path = sp;