diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2015-01-02 21:44:54 +0700 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-09-16 16:55:17 -0400 |
| commit | 6b019a495359909a3d1a778ca10cd7df7cc302cc (patch) | |
| tree | 75746a1e4a3daecd8c9cd0996b3c63d7d1657be4 /gtk2_ardour/ui_config.h | |
| parent | 45d487f16e8be102bfcdefcd950a69c886495b94 (diff) | |
Move UIConfiguration Singleton into UIConfiguration header
This removes the direct dependence on ardour_ui.h from 39 files
Diffstat (limited to 'gtk2_ardour/ui_config.h')
| -rw-r--r-- | gtk2_ardour/ui_config.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h index 0a6e7cda5d..c869dfb420 100644 --- a/gtk2_ardour/ui_config.h +++ b/gtk2_ardour/ui_config.h @@ -37,11 +37,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); @@ -76,14 +77,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)>&); @@ -130,8 +131,6 @@ class UIConfiguration : public PBD::Stateful bool colors_modified; bool modifiers_modified; - static UIConfiguration* _instance; - int store_color_theme (); void load_color_aliases (XMLNode const &); void load_colors (XMLNode const &); |