first compiling, mostly working version of group controls changes

[ardour.git] / gtk2_ardour / ui_config.h

diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index 285bc5366a374e8b769a3cf5452864fa7f568c4d..06338aae39f6ee91f13362c59a18ea3ad2238d3e 100644 (file)
--- a/gtk2_ardour/ui_config.h
+++ b/gtk2_ardour/ui_config.h
@@ -27,6 +27,8 @@
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 
+#include "ardour/types.h" // required for opeators used in pbd/configuration_variable.h
+
 #include "pbd/stateful.h"
 #include "pbd/xml++.h"
 #include "pbd/configuration_variable.h"
@@ -37,11 +39,12 @@
 
 class UIConfiguration : public PBD::Stateful
 {
-    public:
+private:
        UIConfiguration();
        ~UIConfiguration();
 
-       static UIConfiguration* instance() { return _instance; }
+    public:
+       static UIConfiguration& instance();
 
        void load_rc_file (bool themechange, bool allow_own = true);
 
@@ -66,7 +69,7 @@ class UIConfiguration : public PBD::Stateful
        void set_alias (std::string const & name, std::string const & alias);
        void set_color (const std::string& name, ArdourCanvas::Color);
        void set_modifier (std::string const &, ArdourCanvas::SVAModifier svam);
-       
+
        std::string color_as_alias (ArdourCanvas::Color c);
        ArdourCanvas::Color quantized (ArdourCanvas::Color) const;
 
@@ -75,8 +78,17 @@ class UIConfiguration : public PBD::Stateful
        ArdourCanvas::Color color_mod (const ArdourCanvas::Color& color, std::string const & modifier) const;
        ArdourCanvas::HSV  color_hsv (const std::string&) const;
        ArdourCanvas::SVAModifier modifier (const std::string&) const;
-               
-        sigc::signal<void,std::string> ParameterChanged;
+
+       sigc::signal<void>  ColorsChanged;
+
+       void reset_dpi ();
+       void set_pango_fontsize ();
+
+       float get_ui_scale ();
+
+       sigc::signal<void>  DPIReset;
+
+       sigc::signal<void,std::string> ParameterChanged;
        void map_parameters (boost::function<void (std::string)>&);
 
        void parameter_changed (std::string);
@@ -87,10 +99,10 @@ class UIConfiguration : public PBD::Stateful
         */
        int pre_gui_init ();
 
-       /** called after the GUI toolkit has been initialized. 
+       /** called after the GUI toolkit has been initialized.
         */
        UIConfiguration* post_gui_init ();
-       
+
 #undef UI_CONFIG_VARIABLE
 #define UI_CONFIG_VARIABLE(Type,var,name,value) \
        Type get_##var () const { return var.get(); } \
@@ -120,8 +132,6 @@ class UIConfiguration : public PBD::Stateful
        bool aliases_modified;
        bool colors_modified;
        bool modifiers_modified;
-       
-       static UIConfiguration* _instance;
 
        int store_color_theme ();
        void load_color_aliases (XMLNode const &);