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

git-svn-id: svn://localhost/ardour2/branches/3.0@12829 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 8 insertions, 6 deletions

diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index 0a158f29ca..57705e6777 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -29,6 +29,7 @@
 #include "pbd/failed_constructor.h"
 #include "pbd/pathscanner.h"
 #include "pbd/xml++.h"
+#include "pbd/filesystem.h"
 
 #include "midi++/port.h"
 #include "midi++/manager.h"
@@ -147,8 +148,8 @@ GenericMidiControlProtocol::reload_maps ()
 {
 	vector<string *> *midi_maps;
 	PathScanner scanner;
-	SearchPath spath (system_midi_map_search_path());
-	spath += user_midi_map_directory ();
+	SearchPath spath (system_midi_map_search_path().to_string());
+	spath += user_midi_map_directory ().to_string();
 
 	midi_maps = scanner (spath.to_string(), midi_map_filter, 0, false, true);
 
diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc
index c3aaf71fa8..45fd2faebd 100644
--- a/libs/surfaces/mackie/device_info.cc
+++ b/libs/surfaces/mackie/device_info.cc
@@ -445,7 +445,7 @@ static SearchPath
 devinfo_search_path ()
 {
 	bool devinfo_path_defined = false;
-        sys::path spath_env (Glib::getenv (devinfo_env_variable_name, devinfo_path_defined));
+        std::string spath_env (Glib::getenv (devinfo_env_variable_name, devinfo_path_defined));
 
 	if (devinfo_path_defined) {
 		return spath_env;
diff --git a/libs/surfaces/mackie/device_profile.cc b/libs/surfaces/mackie/device_profile.cc
index 3a9013dc9f..fbf7d89361 100644
--- a/libs/surfaces/mackie/device_profile.cc
+++ b/libs/surfaces/mackie/device_profile.cc
@@ -26,6 +26,7 @@
 #include "pbd/error.h"
 #include "pbd/pathscanner.h"
 #include "pbd/replace_all.h"
+#include "pbd/filesystem.h"
 
 #include "ardour/filesystem_paths.h"
 
@@ -59,7 +60,7 @@ static SearchPath
 devprofile_search_path ()
 {
 	bool devprofile_path_defined = false;
-        sys::path spath_env (Glib::getenv (devprofile_env_variable_name, devprofile_path_defined));
+        std::string spath_env (Glib::getenv (devprofile_env_variable_name, devprofile_path_defined));
 
 	if (devprofile_path_defined) {
 		return spath_env;
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index a531f6e41a..731d3f300a 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -189,11 +189,11 @@ OSC::start ()
 	
 	PBD::info << "OSC @ " << get_server_url () << endmsg;
 
-	PBD::sys::path url_file;
+	std::string url_file;
 
 	if (find_file_in_search_path (ardour_config_search_path(), "osc_url", url_file)) {
 		
-		_osc_url_file = url_file.to_string();
+		_osc_url_file = url_file;
 		ofstream urlfile;
 		urlfile.open(_osc_url_file.c_str(), ios::trunc);