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/ardour_ui2.cc | |
| 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/ardour_ui2.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 6a15ec8ea0..116cfc95a3 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -216,7 +216,7 @@ ARDOUR_UI::tearoff_settings (const char* name) const return 0; } -#define PX_SCALE(px) std::max((float)px, rintf((float)px * ARDOUR_UI::config()->get_ui_scale())) +#define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale())) void ARDOUR_UI::setup_transport () @@ -678,7 +678,7 @@ ARDOUR_UI::editor_realized () boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1)); Config->map_parameters (pc); - ARDOUR_UI::config()->reset_dpi (); + UIConfiguration::instance().reset_dpi (); } void @@ -743,7 +743,7 @@ ARDOUR_UI::toggle_follow_edits () RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act); assert (tact); - ui_config->set_follow_edits (tact->get_active ()); + UIConfiguration::instance().set_follow_edits (tact->get_active ()); } |