diff options
Diffstat (limited to 'libs/surfaces/mackie/device_info.cc')
| -rw-r--r-- | libs/surfaces/mackie/device_info.cc | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc index 5646650eeb..8d2186cf0c 100644 --- a/libs/surfaces/mackie/device_info.cc +++ b/libs/surfaces/mackie/device_info.cc @@ -421,7 +421,7 @@ static const char* const devinfo_dir_name = "mcp"; static const char* const devinfo_suffix = ".device"; static SearchPath -system_devinfo_search_path () +devinfo_search_path () { bool devinfo_path_defined = false; sys::path spath_env (Glib::getenv (devinfo_env_variable_name, devinfo_path_defined)); @@ -430,21 +430,12 @@ system_devinfo_search_path () return spath_env; } - SearchPath spath (system_data_search_path()); + SearchPath spath (ardour_data_search_path()); spath.add_subdirectory_to_paths(devinfo_dir_name); return spath; } -static sys::path -user_devinfo_directory () -{ - sys::path p(user_config_directory()); - p /= devinfo_dir_name; - - return p; -} - static bool devinfo_filter (const string &str, void */*arg*/) { @@ -459,8 +450,7 @@ DeviceInfo::reload_device_info () vector<string> s; vector<string *> *devinfos; PathScanner scanner; - SearchPath spath (system_devinfo_search_path()); - spath += user_devinfo_directory (); + SearchPath spath (devinfo_search_path()); devinfos = scanner (spath.to_string(), devinfo_filter, 0, false, true); device_info.clear (); |