Do not try to restore Route solo state after clearing all solo state

[ardour.git] / gtk2_ardour / main_clock.cc

diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc
index c7cb4102a87041b46007fc48943d1860ddee5713..9a7360b41f4502f767619dd7a575e577224907b6 100644 (file)
--- a/gtk2_ardour/main_clock.cc
+++ b/gtk2_ardour/main_clock.cc
@@ -17,11 +17,12 @@
 
 */
 
-#include "ardour_ui.h"
 #include "main_clock.h"
 #include "public_editor.h"
 
-#include "i18n.h"
+#include "ui_config.h"
+
+#include "pbd/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