diff options
Diffstat (limited to 'libs/surfaces/mackie/device_info.cc')
-rw-r--r-- | libs/surfaces/mackie/device_info.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc index 45fd2faebd..04cbfecc56 100644 --- a/libs/surfaces/mackie/device_info.cc +++ b/libs/surfaces/mackie/device_info.cc @@ -24,6 +24,7 @@ #include "pbd/xml++.h" #include "pbd/error.h" #include "pbd/pathscanner.h" +#include "pbd/convert.h" #include "ardour/filesystem_paths.h" @@ -221,7 +222,7 @@ DeviceInfo::set_state (const XMLNode& node, int /* version */) /* strip count is mandatory */ if ((child = node.child ("Strips")) != 0) { if ((prop = child->property ("value")) != 0) { - if ((_strip_cnt = atoi (prop->value())) == 0) { + if ((_strip_cnt = atoi (prop->value().c_str())) == 0) { _strip_cnt = 8; } } @@ -231,7 +232,7 @@ DeviceInfo::set_state (const XMLNode& node, int /* version */) if ((child = node.child ("Extenders")) != 0) { if ((prop = child->property ("value")) != 0) { - if ((_extenders = atoi (prop->value())) == 0) { + if ((_extenders = atoi (prop->value().c_str())) == 0) { _extenders = 0; } } @@ -441,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; @@ -451,14 +452,14 @@ 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; } static bool -devinfo_filter (const string &str, void */*arg*/) +devinfo_filter (const string &str, void* /*arg*/) { return (str.length() > strlen(devinfo_suffix) && str.find (devinfo_suffix) == (str.length() - strlen (devinfo_suffix))); @@ -471,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 (); |