diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2013-08-15 20:04:08 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2013-09-06 14:31:11 +1000 |
| commit | 8ddd12a60d08d895cb5400013cdda2e893fb81bb (patch) | |
| tree | 84c0082083295835e33c38c12acc5e21cb9b7c7e /libs/surfaces/mackie/device_info.cc | |
| parent | e6c7ecf0e369ba886a7dc57a195226921f0f11f1 (diff) | |
Rename SearchPath class Searchpath
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
Diffstat (limited to 'libs/surfaces/mackie/device_info.cc')
| -rw-r--r-- | libs/surfaces/mackie/device_info.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc index e983fe0eb0..04cbfecc56 100644 --- a/libs/surfaces/mackie/device_info.cc +++ b/libs/surfaces/mackie/device_info.cc @@ -442,7 +442,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 SearchPath +static Searchpath devinfo_search_path () { bool devinfo_path_defined = false; @@ -452,7 +452,7 @@ devinfo_search_path () return spath_env; } - SearchPath spath (ardour_data_search_path()); + Searchpath spath (ardour_data_search_path()); spath.add_subdirectory_to_paths(devinfo_dir_name); return spath; @@ -472,7 +472,7 @@ DeviceInfo::reload_device_info () vector<string> s; vector<string *> *devinfos; PathScanner scanner; - SearchPath spath (devinfo_search_path()); + Searchpath spath (devinfo_search_path()); devinfos = scanner (spath.to_string(), devinfo_filter, 0, false, true); device_info.clear (); |