{
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 ();
}
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);
}
void
MainClock::edit_current_meter ()
{
- ARDOUR::Meter m = PublicEditor::instance().session()->tempo_map().meter_at (absolute_time());
- ARDOUR::MeterSection ms (absolute_time(), m.divisions_per_bar(), m.note_divisor());
+ if (!PublicEditor::instance().session()) return;
+ ARDOUR::MeterSection ms = PublicEditor::instance().session()->tempo_map().meter_section_at (absolute_time());
PublicEditor::instance().edit_meter_section (&ms);
}
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);
+}
+