From e653e619231a796cec1346777014ff1a33bd39ca Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 1 Jan 2021 16:00:07 -0700 Subject: [PATCH] fix up redrawing Tempo/Meter rulers when tempo changes --- gtk2_ardour/editor.cc | 2 +- gtk2_ardour/editor.h | 3 +- gtk2_ardour/editor_tempodisplay.cc | 106 +++-------------------------- 3 files changed, 10 insertions(+), 101 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 2be7801cd8..b124d1c573 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -579,7 +579,7 @@ Editor::Editor () _summary = new EditorSummary (this); - TempoMap::MapChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::tempo_map_changed, this), gui_context()); + TempoMap::MapChanged.connect (tempo_map_connection, invalidator (*this), boost::bind (&Editor::tempo_map_changed, this), gui_context()); selection->TimeChanged.connect (sigc::mem_fun(*this, &Editor::time_selection_changed)); selection->TracksChanged.connect (sigc::mem_fun(*this, &Editor::track_selection_changed)); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index f9ea36104a..4ab308ee3c 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1807,9 +1807,7 @@ private: void compute_current_bbt_points (Temporal::TempoMapPoints& grid, samplepos_t left, samplepos_t right); - void tempo_map_property_changed (const PBD::PropertyChange&); void tempo_map_changed (); - void tempometric_position_changed (const PBD::PropertyChange&); void redisplay_grid (bool immediate_redraw); @@ -2179,6 +2177,7 @@ private: int playlist_deletion_dialog (boost::shared_ptr); PBD::ScopedConnectionList session_connections; + PBD::ScopedConnection tempo_map_connection; /* tracking step changes of track height */ diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 04b2442d3b..a33d934645 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -83,14 +83,20 @@ Editor::remove_metric_marks () } tempo_curves.clear (); } + struct CurveComparator { bool operator() (TempoCurve const * a, TempoCurve const * b) { return a->tempo().sclock() < b->tempo().sclock(); } }; + void Editor::draw_metric_marks (TempoMap::Metrics const & metrics) { + if (!_session) { + return; + } + char buf[64]; TempoPoint* prev_ts = 0; double max_tempo = 0.0; @@ -111,7 +117,6 @@ Editor::draw_metric_marks (TempoMap::Metrics const & metrics) metric_marks.push_back (new MeterMarker (*this, *meter_group, UIConfiguration::instance().color ("meter marker"), buf, *ms)); } } else if ((ts = dynamic_cast(*i)) != 0) { - max_tempo = max (max_tempo, ts->note_types_per_minute()); max_tempo = max (max_tempo, ts->end_note_types_per_minute()); min_tempo = min (min_tempo, ts->note_types_per_minute()); @@ -175,111 +180,16 @@ Editor::draw_metric_marks (TempoMap::Metrics const & metrics) } } -void -Editor::tempo_map_property_changed (const PropertyChange& /*ignored*/) -{ - tempo_map_changed (); -} - void Editor::tempo_map_changed () { + PropertyChange pc; + if (!_session) { return; } - ENSURE_GUI_THREAD (*this, &Editor::tempo_map_changed, ignored); - - compute_bbt_ruler_scale (_leftmost_sample, _leftmost_sample + current_page_samples()); - TempoMap::use()->apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers - update_tempo_based_rulers (); - - maybe_draw_grid_lines (); -} - -void -Editor::tempometric_position_changed (const PropertyChange& /*ignored*/) -{ - if (!_session) { - return; - } - - ENSURE_GUI_THREAD (*this, &Editor::tempo_map_changed); - - Temporal::TempoPoint* prev_ts = 0; - double max_tempo = 0.0; - double min_tempo = DBL_MAX; - const samplecnt_t sr (_session->sample_rate()); - - for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) { - TempoMarker* tempo_marker; - MeterMarker* meter_marker; - Temporal::TempoPoint *ts; - Temporal::MeterPoint *ms; - - if ((tempo_marker = dynamic_cast (*x)) != 0) { - if ((ts = &tempo_marker->tempo()) != 0) { - - tempo_marker->set_position (timepos_t (ts->sample (sr))); - - if (prev_ts && abs (prev_ts->end_note_types_per_minute() - ts->note_types_per_minute()) < 1.0) { - tempo_marker->set_points_color (UIConfiguration::instance().color ("tempo marker music")); - } else { - tempo_marker->set_points_color (UIConfiguration::instance().color ("tempo marker")); - } - - max_tempo = max (max_tempo, ts->note_types_per_minute()); - max_tempo = max (max_tempo, ts->end_note_types_per_minute()); - min_tempo = min (min_tempo, ts->note_types_per_minute()); - min_tempo = min (min_tempo, ts->end_note_types_per_minute()); - - prev_ts = ts; - } - } - if ((meter_marker = dynamic_cast (*x)) != 0) { - if ((ms = &meter_marker->meter()) != 0) { - meter_marker->set_position (timepos_t (ms->sample (sr))); - } - } - } - - tempo_curves.sort (CurveComparator()); - - const double min_tempo_range = 5.0; - const double tempo_delta = fabs (max_tempo - min_tempo); - - if (tempo_delta < min_tempo_range) { - max_tempo += min_tempo_range - tempo_delta; - min_tempo += tempo_delta - min_tempo_range; - } - - for (Curves::iterator x = tempo_curves.begin(); x != tempo_curves.end(); ) { - Curves::iterator tmp = x; - (*x)->set_max_tempo (max_tempo); - (*x)->set_min_tempo (min_tempo); - ++tmp; - if (tmp != tempo_curves.end()) { - (*x)->set_position ((*x)->tempo().sample(sr), (*tmp)->tempo().sample(sr)); - } else { - (*x)->set_position ((*x)->tempo().sample(sr), UINT32_MAX); - } - - if (!(*x)->tempo().active()) { - (*x)->hide(); - } else { - (*x)->show(); - } - - ++x; - } - - for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) { - TempoMarker* tempo_marker; - if ((tempo_marker = dynamic_cast (*x)) != 0) { - tempo_marker->update_height_mark ((tempo_marker->tempo().note_types_per_minute() - min_tempo) / max (max_tempo - min_tempo, 10.0)); - } - } compute_bbt_ruler_scale (_leftmost_sample, _leftmost_sample + current_page_samples());