Merge branch 'master' into cairocanvas

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

diff --git a/libs/pbd/pbd/enumwriter.h b/libs/pbd/pbd/enumwriter.h
index 461665d739f0a7b9ad1116bf0677d5354f3bfcd4..95f1ea9e9fe3cdc88b36409cd6cd87e3d3ec9016 100644 (file)
--- a/libs/pbd/pbd/enumwriter.h
+++ b/libs/pbd/pbd/enumwriter.h
@@ -25,18 +25,32 @@
 #include <string>
 #include <vector>
 #include <exception>
-
+#include <sstream>
 
 namespace PBD {
 
 class unknown_enumeration : public std::exception {
   public:
-       virtual const char *what() const throw() { return "unknown enumerator in PBD::EnumWriter"; }
+       unknown_enumeration (std::string const & e) throw() {
+               std::stringstream s;
+               s << "unknown enumerator " << e << " in PBD::EnumWriter";
+               _message = s.str ();
+       }
+
+       ~unknown_enumeration () throw() {}
+       
+       virtual const char *what() const throw() {
+               return _message.c_str();
+       }
+
+private:
+       std::string _message;
 };
 
 class EnumWriter {
   public:
        static EnumWriter& instance();
+       static void destroy();
 
        void register_distinct (std::string type, std::vector<int>, std::vector<std::string>);
        void register_bits     (std::string type, std::vector<int>, std::vector<std::string>);
@@ -71,6 +85,9 @@ class EnumWriter {
 
        static EnumWriter* _instance;
        static std::map<std::string,std::string> hack_table;
+
+
+        int validate (EnumRegistration& er, int value);
 };
 
 }