fix lack of return value in tell_about_jack_death(), and fixed up indentation for...

[ardour.git] / libs / pbd / enumwriter.cc

diff --git a/libs/pbd/enumwriter.cc b/libs/pbd/enumwriter.cc
index c42cc3a5c242c13bb198539cf6b89f7e177f9228..7033e5f3b1b16bb79cb20b957613aca8323eae4a 100644 (file)
--- a/libs/pbd/enumwriter.cc
+++ b/libs/pbd/enumwriter.cc
@@ -18,6 +18,11 @@
     $Id$
 */
 
+#include <cctype>
+
+#include <cstring>
+#include <cstdlib>
+
 #include <pbd/enumwriter.h>
 #include <pbd/error.h>
 #include <pbd/compose.h>
@@ -28,6 +33,35 @@ using namespace PBD;
 #include "i18n.h"
 
 EnumWriter* EnumWriter::_instance = 0;
+map<string,string> EnumWriter::hack_table;
+
+static int 
+nocase_cmp(const string & s1, const string& s2) 
+{
+       string::const_iterator it1 = s1.begin();
+       string::const_iterator it2 = s2.begin();
+       
+       while ((it1 != s1.end()) && (it2 != s2.end())) { 
+               if(::toupper(*it1) != ::toupper(*it2))  {//letters differ?
+                       // return -1 to indicate 'smaller than', 1 otherwise
+                       return (::toupper(*it1) < ::toupper(*it2)) ? -1 : 1; 
+               }
+
+               ++it1;
+               ++it2;
+       }
+
+       string::size_type size1 = s1.size();
+       string::size_type size2 = s2.size();
+
+       //return -1,0 or 1 according to strings' lengths
+
+       if (size1 == size2) {
+               return 0;
+       }
+
+       return (size1 < size2) ? -1 : 1;
+}
 
 EnumWriter::EnumWriter ()
 {
@@ -149,13 +183,25 @@ EnumWriter::read_bits (EnumRegistration& er, string str)
        bool found = false;
        string::size_type comma;
 
+       /* catch old-style hex numerics */
+
+       if (str.length() > 2 && str[0] == '0' && str[1] == 'x') {
+               return strtol (str.c_str(), (char **) 0, 16);
+       }
+
+       /* catch old style dec numerics */
+
+       if (strspn (str.c_str(), "0123456789") == str.length()) {
+               return strtol (str.c_str(), (char **) 0, 10);
+       }
+
        do {
                
                comma = str.find_first_of (',');
                string segment = str.substr (0, comma);
 
                for (i = er.values.begin(), s = er.names.begin(); i != er.values.end(); ++i, ++s) {
-                       if (segment == (*s)) {
+                       if (segment == *s || nocase_cmp (segment, *s) == 0) {
                                result |= (*i);
                                found = true;
                        }
@@ -182,13 +228,46 @@ EnumWriter::read_distinct (EnumRegistration& er, string str)
        vector<int>::iterator i;
        vector<string>::iterator s;
 
+       /* catch old-style hex numerics */
+
+       if (str.length() > 2 && str[0] == '0' && str[1] == 'x') {
+               return strtol (str.c_str(), (char **) 0, 16);
+       }
+
+       /* catch old style dec numerics */
+
+       if (strspn (str.c_str(), "0123456789") == str.length()) {
+               return strtol (str.c_str(), (char **) 0, 10);
+       }
+
        for (i = er.values.begin(), s = er.names.begin(); i != er.values.end(); ++i, ++s) {
-               if (str == (*s)) {
+               if (str == (*s) || nocase_cmp (str, *s) == 0) {
                        return (*i);
                }
        }
 
+       /* failed to find it as-is. check to see if there a hack for the name we're looking up */
+
+       map<string,string>::iterator x;
+
+       if ((x  = hack_table.find (str)) != hack_table.end()) {
+
+               cerr << "found hack for " << str << " = " << x->second << endl;
+
+               str = x->second;
+
+               for (i = er.values.begin(), s = er.names.begin(); i != er.values.end(); ++i, ++s) {
+                       if (str == (*s) || nocase_cmp (str, *s) == 0) {
+                               return (*i);
+                       }
+               }
+       }
+
        throw unknown_enumeration();
 }
 
-
+void
+EnumWriter::add_to_hack_table (string str, string hacked)
+{
+       hack_table[str] = hacked;
+}