Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / ui_config.h

diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index da1ebd3784bec73ea597d790395493337e7e0189..bfa8859afdc671994b52935dfaae33a06e604bf5 100644 (file)
--- a/gtk2_ardour/ui_config.h
+++ b/gtk2_ardour/ui_config.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 #include <ostream>
 #include <iostream>
 
-#include "pbd/stateful.h" 
+#include "pbd/stateful.h"
 #include "pbd/xml++.h"
 #include "ardour/configuration_variable.h"
 
@@ -74,32 +74,55 @@ class UIConfiguration : public PBD::Stateful
        UIConfiguration();
        ~UIConfiguration();
 
-       std::vector<UIConfigVariable<uint32_t> *> canvas_colors;
+       std::map<std::string,UIConfigVariable<uint32_t> *> canvas_colors;
+
+       bool dirty () const;
+       void set_dirty ();
 
        int load_state ();
        int save_state ();
        int load_defaults ();
 
-       int set_state (const XMLNode&);
+       int set_state (const XMLNode&, int version);
        XMLNode& get_state (void);
        XMLNode& get_variables (std::string);
        void set_variables (const XMLNode&);
        void pack_canvasvars ();
 
-       sigc::signal<void,const char*> ParameterChanged;
+       uint32_t color_by_name (const std::string&);
+
+        sigc::signal<void,std::string> ParameterChanged;
+       void map_parameters (boost::function<void (std::string)>&);
 
+#undef UI_CONFIG_VARIABLE
+#define UI_CONFIG_VARIABLE(Type,var,name,value) \
+       Type get_##var () const { return var.get(); } \
+       bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret;  }
+#include "ui_config_vars.h"
 #undef  UI_CONFIG_VARIABLE
+#undef CANVAS_VARIABLE
+#define CANVAS_VARIABLE(var,name) \
+       uint32_t get_##var () const { return var.get(); } \
+       bool set_##var (uint32_t val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret;  }
+#include "canvas_vars.h"
 #undef  CANVAS_VARIABLE
-#define UI_CONFIG_VARIABLE(Type,var,name,val) UIConfigVariable<Type> var;
-#define CANVAS_VARIABLE(var,name) UIConfigVariable<uint32_t> var;
+
+  private:
+
+       /* declare variables */
+
+#undef  UI_CONFIG_VARIABLE
+#define UI_CONFIG_VARIABLE(Type,var,name,value) UIConfigVariable<Type> var;
 #include "ui_config_vars.h"
+#undef UI_CONFIG_VARIABLE
+
+#undef CANVAS_VARIABLE
+#define CANVAS_VARIABLE(var,name) UIConfigVariable<uint32_t> var;
 #include "canvas_vars.h"
-#undef  UI_CONFIG_VARIABLE
 #undef  CANVAS_VARIABLE
 
-  private:
        XMLNode& state ();
-       bool hack;
+       bool _dirty;
 };
 
 #endif /* __ardour_ui_configuration_h__ */