ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

fix bitwise enum parsing

Browse Source
This commit is contained in:
Robin Gareus 2015-09-05 00:00:16 +02:00
parent 015b588d65
commit b66bf67030
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libs/pbd/enumwriter.cc
View File

@ -189,7 +189,7 @@ EnumWriter::write_distinct (EnumRegistration& er, int value)
}
int
EnumWriter::validate (EnumRegistration& er, int val)
EnumWriter::validate (EnumRegistration& er, int val) const
{
if (er.values.empty()) {
return val;
@ -204,7 +204,7 @@ EnumWriter::validate (EnumRegistration& er, int val)
vector<int>::iterator i;
string enum_name = _("unknown enumeration");
for (Registry::iterator x = registry.begin(); x != registry.end(); ++x) {
for (Registry::const_iterator x = registry.begin(); x != registry.end(); ++x) {
if (&er == &(*x).second) {
enum_name = (*x).first;
}
@ -223,6 +223,21 @@ EnumWriter::validate (EnumRegistration& er, int val)
return er.values.front();
}
int
EnumWriter::validate_bitwise (EnumRegistration& er, int val) const
{
int result = 0;
for (int p = 1; p <= val; p = p << 1) {
if (std::find (er.values.begin(), er.values.end(), p) == er.values.end()) {
continue;
}
if (p & val) {
result |= p;
}
}
return result;
}
int
EnumWriter::read_bits (EnumRegistration& er, string str)
{
@ -236,14 +251,14 @@ EnumWriter::read_bits (EnumRegistration& er, string str)
if (str.length() > 2 && str[0] == '0' && str[1] == 'x') {
int val = strtol (str.c_str(), (char **) 0, 16);
return validate (er, val);
return validate_bitwise (er, val);
}
/* catch old style dec numerics */
if (strspn (str.c_str(), "0123456789") == str.length()) {
int val = strtol (str.c_str(), (char **) 0, 10);
return validate (er, val);
return validate_bitwise (er, val);
}
do {

4
libs/pbd/pbd/enumwriter.h
View File

@ -88,8 +88,8 @@ class LIBPBD_API EnumWriter {
static EnumWriter* _instance;
static std::map<std::string,std::string> hack_table;
int validate (EnumRegistration& er, int value);
int validate (EnumRegistration& er, int value) const;
int validate_bitwise (EnumRegistration& er, int value) const;
};
}