Move UIConfiguration Singleton into UIConfiguration header

[ardour.git] / gtk2_ardour / main_clock.cc

diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc
index c7cb4102a87041b46007fc48943d1860ddee5713..1f217ef8a3c7392e09187305c164eb6b182fb5b4 100644 (file)
--- 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 ());
        }
 }