Do not try to restore Route solo state after clearing all solo state

[ardour.git] / gtk2_ardour / ui_config.h

diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index 06338aae39f6ee91f13362c59a18ea3ad2238d3e..2fac5e571dc9fa62b994b8c275e5da30f4be23cb 100644 (file)
--- a/gtk2_ardour/ui_config.h
+++ b/gtk2_ardour/ui_config.h
@@ -46,18 +46,22 @@ private:
     public:
        static UIConfiguration& instance();
 
+       static std::string color_file_suffix;
+
        void load_rc_file (bool themechange, bool allow_own = true);
 
        int load_state ();
        int save_state ();
        int load_defaults ();
-       int load_color_theme (bool allow_own=true);
+       int load_color_theme (bool allow_own);
 
        int set_state (const XMLNode&, int version);
        XMLNode& get_state (void);
        XMLNode& get_variables (std::string);
        void set_variables (const XMLNode&);
 
+       std::string  color_file_name (bool use_my, 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;
@@ -82,7 +86,6 @@ private:
        sigc::signal<void>  ColorsChanged;
 
        void reset_dpi ();
-       void set_pango_fontsize ();
 
        float get_ui_scale ();
 
@@ -133,15 +136,15 @@ private:
        bool colors_modified;
        bool modifiers_modified;
 
-       int store_color_theme ();
+       int  store_color_theme ();
        void load_color_aliases (XMLNode const &);
        void load_colors (XMLNode const &);
        void load_modifiers (XMLNode const &);
        void reset_gtk_theme ();
+       int  load_color_file (std::string const &);
        void colors_changed ();
 
        uint32_t block_save;
 };
 
 #endif /* __ardour_ui_configuration_h__ */
-