diff options
author | Tim Mayberry <mojofunk@gmail.com> | 2014-06-17 21:41:29 +1000 |
---|---|---|
committer | Tim Mayberry <mojofunk@gmail.com> | 2014-06-17 21:41:29 +1000 |
commit | 547689a0552661108806a4028960f32d1b20adf8 (patch) | |
tree | 0c1174b469b7351a4ef6515218411cffffa0a180 /libs/surfaces/mackie | |
parent | cb6934a189ce3940cdfa05dd5e302a8006afa83f (diff) |
Replace all use of PathScanner with equivalent functions from pbd/file_utils.h
Diffstat (limited to 'libs/surfaces/mackie')
-rw-r--r-- | libs/surfaces/mackie/device_info.cc | 5 | ||||
-rw-r--r-- | libs/surfaces/mackie/device_profile.cc | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc index 672bb25511..c0675c8377 100644 --- a/libs/surfaces/mackie/device_info.cc +++ b/libs/surfaces/mackie/device_info.cc @@ -23,7 +23,7 @@ #include "pbd/xml++.h" #include "pbd/error.h" -#include "pbd/pathscanner.h" +#include "pbd/file_utils.h" #include "pbd/convert.h" #include "pbd/stl_delete.h" @@ -472,10 +472,9 @@ DeviceInfo::reload_device_info () DeviceInfo di; vector<string> s; vector<string> devinfos; - PathScanner scanner; Searchpath spath (devinfo_search_path()); - devinfos = scanner (spath.to_string(), devinfo_filter, 0, false, true); + find_files_matching_filter (devinfos, spath.to_string(), devinfo_filter, 0, false, true); device_info.clear (); if (devinfos.empty()) { diff --git a/libs/surfaces/mackie/device_profile.cc b/libs/surfaces/mackie/device_profile.cc index 42b70830cb..269ff36aca 100644 --- a/libs/surfaces/mackie/device_profile.cc +++ b/libs/surfaces/mackie/device_profile.cc @@ -24,7 +24,7 @@ #include "pbd/xml++.h" #include "pbd/error.h" -#include "pbd/pathscanner.h" +#include "pbd/file_utils.h" #include "pbd/stl_delete.h" #include "pbd/replace_all.h" @@ -91,10 +91,9 @@ DeviceProfile::reload_device_profiles () DeviceProfile dp; vector<string> s; vector<string> devprofiles; - PathScanner scanner; Searchpath spath (devprofile_search_path()); - devprofiles = scanner (spath.to_string(), devprofile_filter, 0, false, true); + find_files_matching_filter (devprofiles, spath.to_string(), devprofile_filter, 0, false, true); device_profiles.clear (); if (devprofiles.empty()) { |