*/
-#include "ardour_ui.h"
+#include "ardour/tempo.h"
+
+#include "actions.h"
#include "main_clock.h"
+#include "ui_config.h"
#include "public_editor.h"
-#include "i18n.h"
-
-#include "ardour/tempo.h"
+#include "pbd/i18n.h"
using namespace Gtk;
: AudioClock (clock_name, false, widget_name, true, true, false, true)
, _primary (primary)
{
+}
+void
+MainClock::set_session (ARDOUR::Session *s)
+{
+ AudioClock::set_session (s);
+ _left_btn.set_related_action (ActionManager::get_action (X_("Editor"), X_("edit-current-tempo")));
+ _right_btn.set_related_action (ActionManager::get_action (X_("Editor"), X_("edit-current-meter")));
}
void
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);
}
}
{
if (get_is_duration ()) {
// delta to edit cursor
- return current_time () + PublicEditor::instance().get_preferred_edit_position (true);
+ return current_time () + PublicEditor::instance().get_preferred_edit_position (Editing::EDIT_IGNORE_PHEAD);
} else {
return current_time ();
}
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 ());
}
}
void
MainClock::edit_current_tempo ()
{
- ARDOUR::TempoSection ts = PublicEditor::instance().session()->tempo_map().tempo_section_at (absolute_time());
- PublicEditor::instance().edit_tempo_section (&ts);
+ if (!PublicEditor::instance().session()) return;
+ 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 ()
{
- ARDOUR::MeterSection ms = PublicEditor::instance().session()->tempo_map().meter_section_at (absolute_time());
- PublicEditor::instance().edit_meter_section (&ms);
+ if (!PublicEditor::instance().session()) return;
+ 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
{
PublicEditor::instance().mouse_add_new_meter_event (absolute_time ());
}
-
-bool
-MainClock::on_button_press_event (GdkEventButton *ev)
-{
- if (ev->button == 1) {
- if (mode() == BBT) {
- if (is_lower_layout_click(ev->y)) {
- if (is_right_layout_click(ev->x)) {
- // meter on the right
- edit_current_meter();
- } else {
- // tempo on the left
- edit_current_tempo();
- }
- return true;
- }
- }
- }
-
- return AudioClock::on_button_press_event (ev);
-}
-