From 1de542120aebf05273b2ff81126c48f881b8b656 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 22 Jun 2022 13:14:47 -0600 Subject: [PATCH] editor: remove a couple of unnecessary uses of Beats::from_double() and uses ::ticks() method instead --- gtk2_ardour/editor.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 87b3459c4b..c1f03263f2 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4317,7 +4317,8 @@ Editor::get_grid_type_as_beats (bool& success, timepos_t const & position) int32_t const divisions = get_grid_beat_divisions (_grid_type); /* Beat (+1), and Bar (-1) are handled below */ if (divisions > 1) { - return Temporal::Beats::from_double (1.0 / (double) divisions); + /* grid divisions are divisions of a 1/4 note */ + return Temporal::Beats::ticks(Temporal::Beats::PPQN / divisions); } TempoMap::SharedPtr tmap (TempoMap::use()); @@ -4389,11 +4390,11 @@ Temporal::Beats Editor::get_draw_length_as_beats (bool& success, timepos_t const & position) { success = true; - GridType grid_to_use = draw_length() == DRAW_LEN_AUTO ? grid_type() : draw_length(); int32_t const divisions = get_grid_beat_divisions (grid_to_use); + if (divisions != 0) { - return Temporal::Beats::from_double (1.0 / fabs (divisions)); + return Temporal::Beats::ticks (Temporal::Beats::PPQN / divisions); } success = false;