*/
-#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"
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);
}
}
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 ());
}
}
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