From 734a62101fee342e0feb914a3a1d18a76301d5ee Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 11 Sep 2023 10:07:04 -0600 Subject: [PATCH] remove use of Tempo::active() from GUI This has not been accessible in the GUI since 7.0. --- gtk2_ardour/editor_drag.cc | 19 +++---------------- gtk2_ardour/editor_markers.cc | 3 --- gtk2_ardour/editor_tempodisplay.cc | 8 ++------ 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 74ce7beb81..db2c68426c 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3260,15 +3260,9 @@ void TempoMarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) { Drag::start_grab (event, cursor); - if (!_real_section->active ()) { - show_verbose_cursor_text (_("inactive")); - } else { - show_verbose_cursor_time (adjusted_current_time (event)); - - /* setup thread-local tempo map ptr as a writable copy */ - - map = _editor->begin_tempo_map_edit (); - } + show_verbose_cursor_time (adjusted_current_time (event)); + /* setup thread-local tempo map ptr as a writable copy */ + map = _editor->begin_tempo_map_edit (); } void @@ -3280,10 +3274,6 @@ TempoMarkerDrag::setup_pointer_offset () void TempoMarkerDrag::motion (GdkEvent* event, bool first_move) { - if (!_marker->tempo ().active ()) { - return; - } - if (first_move) { /* get current state */ _before_state = &map->get_state (); @@ -3318,9 +3308,6 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) void TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred) { - if (!_marker->tempo ().active ()) { - return; - } if (!movement_occurred) { /* reset the per-thread tempo map ptr back to the current diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index cd2c301bf9..d6e2764e31 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -1030,9 +1030,6 @@ Editor::tempo_map_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* i build_meter_marker_menu (mm, can_remove); meter_marker_menu->popup (1, ev->time); } else if (tm) { - if (!tm->tempo().active()) { - return; - } can_remove = !tm->tempo().map().is_initial(tm->tempo()) && !tm->tempo().locked_to_meter(); build_tempo_marker_menu (tm, can_remove); tempo_marker_menu->popup (1, ev->time); diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index dbe02e8a2c..6c3e4ffcef 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -280,11 +280,7 @@ Editor::update_tempo_curves (double min_tempo, double max_tempo, samplecnt_t sr) curve.set_duration (samplecnt_t (UINT32_MAX)); } - if (!tm->tempo().active()) { - curve.hide(); - } else { - curve.show(); - } + curve.show(); } } @@ -568,7 +564,7 @@ Editor::remove_tempo_marker (ArdourCanvas::Item* item) abort(); /*NOTREACHED*/ } - if (!tempo_marker->tempo().locked_to_meter() && tempo_marker->tempo().active()) { + if (!tempo_marker->tempo().locked_to_meter()) { Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo())); } }