ardour/livetrax
13
0
Fork 0
Code

'surfaces/mackie' - Other minor changes needed for building with MSVC

Browse Source
This commit is contained in:
John Emmas 2013-09-05 10:03:07 +01:00
parent a7ab40e8ae
commit 447e986a0a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}
}
@ -458,7 +459,7 @@ devinfo_search_path ()
}
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)));

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

@ -78,7 +78,7 @@ user_devprofile_directory ()
}
static bool
devprofile_filter (const string &str, void */*arg*/)
devprofile_filter (const string &str, void* /*arg*/)
{
return (str.length() > strlen(devprofile_suffix) &&
str.find (devprofile_suffix) == (str.length() - strlen (devprofile_suffix)));