Merge branch 'master' into windows

[ardour.git] / gtk2_ardour / ui_config.h

diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index 4a099fbc8d0ba92be7dd599cd732a0dd47407640..f96659de76a661a60a2e00744392f3c06fca9494 100644 (file)
--- a/gtk2_ardour/ui_config.h
+++ b/gtk2_ardour/ui_config.h
@@ -74,18 +74,23 @@ 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 ();
 
+       uint32_t color_by_name (const std::string&);
+
        sigc::signal<void,const char*> ParameterChanged;
 
 #undef  UI_CONFIG_VARIABLE
@@ -99,7 +104,7 @@ class UIConfiguration : public PBD::Stateful
 
   private:
        XMLNode& state ();
-       bool hack;
+       bool _dirty;
 };
 
 #endif /* __ardour_ui_configuration_h__ */