Move UIConfiguration Singleton into UIConfiguration header

This removes the direct dependence on ardour_ui.h from 39 files
This commit is contained in:
Tim Mayberry 2015-01-02 21:44:54 +07:00 committed by Paul Davis
parent 45d487f16e
commit 6b019a4953
84 changed files with 726 additions and 712 deletions

View file

@ -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 &);