diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-05 20:29:46 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-05 20:29:46 +0000 |
| commit | 962cb312941a63223964c8bec8c761e328daf463 (patch) | |
| tree | 765c52bb9338a36122cb6373724b0edfa81d4dfc /libs | |
| parent | d8627637a5b35b888cc73f7a38b24d642dde5256 (diff) | |
tweak MCP search paths
git-svn-id: svn://localhost/ardour2/branches/3.0@12195 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/surfaces/mackie/device_info.cc | 9 | ||||
| -rw-r--r-- | libs/surfaces/mackie/device_profile.cc | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc index e9e5d1b04b..12a6f90e5e 100644 --- a/libs/surfaces/mackie/device_info.cc +++ b/libs/surfaces/mackie/device_info.cc @@ -405,7 +405,7 @@ static const char * const devinfo_env_variable_name = "ARDOUR_MCP_PATH"; static const char* const devinfo_dir_name = "mcp"; static const char* const devinfo_suffix = ".device"; -static sys::path +static SearchPath system_devinfo_search_path () { bool devinfo_path_defined = false; @@ -418,12 +418,7 @@ system_devinfo_search_path () SearchPath spath (system_data_search_path()); spath.add_subdirectory_to_paths(devinfo_dir_name); - // just return the first directory in the search path that exists - SearchPath::const_iterator i = std::find_if(spath.begin(), spath.end(), sys::exists); - - if (i == spath.end()) return sys::path(); - - return *i; + return spath; } static sys::path diff --git a/libs/surfaces/mackie/device_profile.cc b/libs/surfaces/mackie/device_profile.cc index 110038ca2b..d7667ce721 100644 --- a/libs/surfaces/mackie/device_profile.cc +++ b/libs/surfaces/mackie/device_profile.cc @@ -55,7 +55,7 @@ static const char * const devprofile_env_variable_name = "ARDOUR_MCP_PATH"; static const char* const devprofile_dir_name = "mcp"; static const char* const devprofile_suffix = ".profile"; -static sys::path +static SearchPath system_devprofile_search_path () { bool devprofile_path_defined = false; @@ -68,12 +68,7 @@ system_devprofile_search_path () SearchPath spath (system_data_search_path()); spath.add_subdirectory_to_paths(devprofile_dir_name); - // just return the first directory in the search path that exists - SearchPath::const_iterator i = std::find_if(spath.begin(), spath.end(), sys::exists); - - if (i == spath.end()) return sys::path(); - - return *i; + return spath; } static sys::path |