Better choice for ports on external send creation

[ardour.git] / gtk2_ardour / ui_config.h

diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index 0a6e7cda5dcce28693f97c79a14b9a6fbecd6c6e..ddfd2f9ecd3f25defe8319f3706faafbe81397b6 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,14 @@
 
 class UIConfiguration : public PBD::Stateful
 {
-    public:
+private:
        UIConfiguration();
        ~UIConfiguration();
 
-       static UIConfiguration* instance() { return _instance; }
+    public:
+       static UIConfiguration& instance();
+
+       static std::string color_file_suffix;
 
        void load_rc_file (bool themechange, bool allow_own = true);
 
@@ -55,6 +60,8 @@ class UIConfiguration : public PBD::Stateful
        XMLNode& get_variables (std::string);
        void set_variables (const XMLNode&);
 
+       std::string  color_file_name (bool use_my, bool with_program_name, bool with_version) const;
+
        typedef std::map<std::string,ArdourCanvas::Color> Colors;
        typedef std::map<std::string,std::string> ColorAliases;
        typedef std::map<std::string,ArdourCanvas::SVAModifier> Modifiers;
@@ -66,7 +73,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;
 
@@ -76,14 +83,14 @@ class UIConfiguration : public PBD::Stateful
        ArdourCanvas::HSV  color_hsv (const std::string&) const;
        ArdourCanvas::SVAModifier modifier (const std::string&) const;
 
-       static sigc::signal<void>  ColorsChanged;
+       sigc::signal<void>  ColorsChanged;
 
        void reset_dpi ();
        void set_pango_fontsize ();
 
        float get_ui_scale ();
-               
-       static sigc::signal<void>  DPIReset;
+
+       sigc::signal<void>  DPIReset;
 
        sigc::signal<void,std::string> ParameterChanged;
        void map_parameters (boost::function<void (std::string)>&);
@@ -96,10 +103,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(); } \
@@ -129,8 +136,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 &);
@@ -143,4 +148,3 @@ class UIConfiguration : public PBD::Stateful
 };
 
 #endif /* __ardour_ui_configuration_h__ */
-