ardour/livetrax
13
0
Fork 0
Code

tweak MCP search paths

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12195 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-05-05 20:29:46 +00:00
parent d8627637a5
commit 962cb31294
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/surfaces/mackie/device_info.cc
View File

@ -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_dir_name = "mcp";
static const char* const devinfo_suffix = ".device"; static const char* const devinfo_suffix = ".device";
static sys::path static SearchPath
system_devinfo_search_path () system_devinfo_search_path ()
{ {
bool devinfo_path_defined = false; bool devinfo_path_defined = false;
@ -418,12 +418,7 @@ system_devinfo_search_path ()
SearchPath spath (system_data_search_path()); SearchPath spath (system_data_search_path());
spath.add_subdirectory_to_paths(devinfo_dir_name); spath.add_subdirectory_to_paths(devinfo_dir_name);
// just return the first directory in the search path that exists return spath;
SearchPath::const_iterator i = std::find_if(spath.begin(), spath.end(), sys::exists);
if (i == spath.end()) return sys::path();
return *i;
} }
static sys::path static sys::path

9
libs/surfaces/mackie/device_profile.cc
View File

@ -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_dir_name = "mcp";
static const char* const devprofile_suffix = ".profile"; static const char* const devprofile_suffix = ".profile";
static sys::path static SearchPath
system_devprofile_search_path () system_devprofile_search_path ()
{ {
bool devprofile_path_defined = false; bool devprofile_path_defined = false;
@ -68,12 +68,7 @@ system_devprofile_search_path ()
SearchPath spath (system_data_search_path()); SearchPath spath (system_data_search_path());
spath.add_subdirectory_to_paths(devprofile_dir_name); spath.add_subdirectory_to_paths(devprofile_dir_name);
// just return the first directory in the search path that exists return spath;
SearchPath::const_iterator i = std::find_if(spath.begin(), spath.end(), sys::exists);
if (i == spath.end()) return sys::path();
return *i;
} }
static sys::path static sys::path