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/main_clock.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/main_clock.cc')
| -rw-r--r-- | gtk2_ardour/main_clock.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc index c7cb4102a8..1f217ef8a3 100644 --- a/gtk2_ardour/main_clock.cc +++ b/gtk2_ardour/main_clock.cc @@ -17,10 +17,11 @@ */ -#include "ardour_ui.h" #include "main_clock.h" #include "public_editor.h" +#include "ui_config.h" + #include "i18n.h" #include "ardour/tempo.h" @@ -50,13 +51,13 @@ MainClock::build_ops_menu () ops_items.push_back (CheckMenuElem (_("Display delta to edit cursor"), sigc::mem_fun (*this, &MainClock::display_delta_to_edit_cursor))); Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem *> (&ops_items.back()); if (_primary) { - if (ARDOUR_UI::config()->get_primary_clock_delta_edit_cursor ()) { - ARDOUR_UI::config()->set_primary_clock_delta_edit_cursor (false); + if (UIConfiguration::instance().get_primary_clock_delta_edit_cursor ()) { + UIConfiguration::instance().set_primary_clock_delta_edit_cursor (false); c->set_active (true); } } else { - if (ARDOUR_UI::config()->get_secondary_clock_delta_edit_cursor ()) { - ARDOUR_UI::config()->set_secondary_clock_delta_edit_cursor (false); + if (UIConfiguration::instance().get_secondary_clock_delta_edit_cursor ()) { + UIConfiguration::instance().set_secondary_clock_delta_edit_cursor (false); c->set_active (true); } } @@ -83,9 +84,9 @@ void MainClock::display_delta_to_edit_cursor () { if (_primary) { - ARDOUR_UI::config()->set_primary_clock_delta_edit_cursor (!ARDOUR_UI::config()->get_primary_clock_delta_edit_cursor ()); + UIConfiguration::instance().set_primary_clock_delta_edit_cursor (!UIConfiguration::instance().get_primary_clock_delta_edit_cursor ()); } else { - ARDOUR_UI::config()->set_secondary_clock_delta_edit_cursor (!ARDOUR_UI::config()->get_secondary_clock_delta_edit_cursor ()); + UIConfiguration::instance().set_secondary_clock_delta_edit_cursor (!UIConfiguration::instance().get_secondary_clock_delta_edit_cursor ()); } } |