From 2a6b2dfa7c5f2ead98e425ea50be49f5f22eabf7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 7 Dec 2020 14:44:39 -0700 Subject: [PATCH] cease using BarTime for anything --- gtk2_ardour/automation_line.cc | 15 ++------------- gtk2_ardour/edit_note_dialog.cc | 4 ++-- gtk2_ardour/tempo_dialog.cc | 3 +-- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 3d51abb60f..daf2ad5cbd 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -1169,28 +1169,17 @@ AutomationLine::set_state (const XMLNode &node, int version) Temporal::timepos_t AutomationLine::view_to_model_coord (double x, double& y) const { - assert (alist->time_domain() != Temporal::BarTime); - view_to_model_coord_y (y); Temporal::timepos_t w; #warning NUTEMPO FIX ME ... this accepts view coordinate as double and things it can infer beats etc - switch (alist->time_domain()) { - case Temporal::AudioTime: + if (alist->time_domain() == Temporal::AudioTime) { return timepos_t (samplepos_t (x)); - break; - case Temporal::BeatTime: - return timepos_t (Temporal::Beats::from_double (x)); - break; - default: - /*NOTREACHED*/ - break; } - /*NOTREACHED*/ - return timepos_t(); + return timepos_t (Temporal::Beats::from_double (x)); } void diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc index 9d8116a729..079dc64413 100644 --- a/gtk2_ardour/edit_note_dialog.cc +++ b/gtk2_ardour/edit_note_dialog.cc @@ -111,10 +111,10 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, set n) _length_clock.set_session (_region_view->get_time_axis_view().session ()); _length_clock.set_mode (AudioClock::BBT); - dur = _region_view->region_relative_distance (timecnt_t ((*_events.begin())->note()->end_time (), timepos_t()), BarTime); + dur = _region_view->region_relative_distance (timecnt_t ((*_events.begin())->note()->end_time (), timepos_t()), BeatTime); pos = _region_view->region()->position() + dur; timecnt_t offset; - dur = _region_view->region_relative_distance (timecnt_t ((*_events.begin())->note()->time (), timepos_t()), BarTime); + dur = _region_view->region_relative_distance (timecnt_t ((*_events.begin())->note()->time (), timepos_t()), BeatTime); offset = timecnt_t (_region_view->region()->position(), timepos_t()) + dur; _length_clock.set_is_duration (true, pos); diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 1e4c1902ee..b63ed27ff6 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -79,8 +79,7 @@ TempoDialog::TempoDialog (TempoMap::SharedPtr const & map, TempoPoint& point, co , tap_tempo_button (_("Tap tempo")) { Temporal::BBT_Time when (map->bbt_at (point.time())); - init (when, _section->note_types_per_minute(), _section->end_note_types_per_minute(), _section->note_type(), _section->type(), - (map->is_initial (point) ||(map->time_domain() == Temporal::BarTime)), map->time_domain()); + init (when, _section->note_types_per_minute(), _section->end_note_types_per_minute(), _section->note_type(), _section->type(), map->is_initial (point), map->time_domain()); } void