X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmain_clock.cc;h=6c5a48f5701a86a86258523ec3e5032e9669f347;hb=28bb82cee7400cb26a97cd4113e76b5a7dc81ca2;hp=c7cb4102a87041b46007fc48943d1860ddee5713;hpb=6847b59721546cbd20eaebf8db34f5d241aa9585;p=ardour.git

diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc
index c7cb4102a8..6c5a48f570 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 ());
 	}
 }
 
@@ -93,16 +94,16 @@ void
 MainClock::edit_current_tempo ()
 {
 	if (!PublicEditor::instance().session()) return;
-	ARDOUR::TempoSection ts = PublicEditor::instance().session()->tempo_map().tempo_section_at (absolute_time());
-	PublicEditor::instance().edit_tempo_section (&ts);
+	ARDOUR::TempoSection* ts = const_cast<ARDOUR::TempoSection*>(&PublicEditor::instance().session()->tempo_map().tempo_section_at_frame (absolute_time()));
+	PublicEditor::instance().edit_tempo_section (ts);
 }
 
 void
 MainClock::edit_current_meter ()
 {
 	if (!PublicEditor::instance().session()) return;
-	ARDOUR::MeterSection ms = PublicEditor::instance().session()->tempo_map().meter_section_at (absolute_time());
-	PublicEditor::instance().edit_meter_section (&ms);
+	ARDOUR::MeterSection* ms = const_cast<ARDOUR::MeterSection*>(&PublicEditor::instance().session()->tempo_map().meter_section_at_frame (absolute_time()));
+	PublicEditor::instance().edit_meter_section (ms);
 }
 
 void