diff options
author | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:06:54 +0000 |
---|---|---|
committer | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:06:54 +0000 |
commit | 105caf23daf5aed16c7ee8b904fcca2ddbd4f59f (patch) | |
tree | 4d74f6c8722790e6fb9d58888ea225866fc98d3c /libs/ardour/control_protocol_search_path.cc | |
parent | 22e478e7fc4952dd386391e85d8e7fa2491ae953 (diff) |
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
Diffstat (limited to 'libs/ardour/control_protocol_search_path.cc')
-rw-r--r-- | libs/ardour/control_protocol_search_path.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libs/ardour/control_protocol_search_path.cc b/libs/ardour/control_protocol_search_path.cc index 157531cbf2..254cd03fe9 100644 --- a/libs/ardour/control_protocol_search_path.cc +++ b/libs/ardour/control_protocol_search_path.cc @@ -36,18 +36,11 @@ namespace ARDOUR { SearchPath control_protocol_search_path () { - SearchPath spath (user_config_directory ()); - + SearchPath spath(user_config_directory ()); spath += ardour_dll_directory (); spath.add_subdirectory_to_paths (surfaces_dir_name); - - bool surfaces_path_defined = false; - SearchPath spath_env (Glib::getenv(surfaces_env_variable_name, surfaces_path_defined)); - if (surfaces_path_defined) { - spath += spath_env; - } - + spath += SearchPath(Glib::getenv(surfaces_env_variable_name)); return spath; } |