From db73afcaa513e1802f709c9dd063f9e52fa20eb7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 23 Mar 2020 18:37:27 -0600 Subject: [PATCH] extend fixed-width improvements to master delta to LTC --- libs/ardour/ltc_slave.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc index 6f3f464419..2117020e92 100644 --- a/libs/ardour/ltc_slave.cc +++ b/libs/ardour/ltc_slave.cc @@ -657,16 +657,22 @@ LTC_TransportMaster::position_string() const std::string LTC_TransportMaster::delta_string() const { - char delta[80]; + char delta[128]; if (!_collect || current.timestamp == 0) { snprintf (delta, sizeof(delta), "\u2012\u2012\u2012\u2012"); } else if ((monotonic_cnt - current.timestamp) > 2 * samples_per_ltc_frame) { snprintf (delta, sizeof(delta), "%s", _("flywheel")); } else { - snprintf (delta, sizeof(delta), "%s%s%lldsm", - sync_lock_broken ? "red" : "white", - LEADINGZERO(::llabs(_current_delta)), PLUSMINUS(-_current_delta), ::llabs(_current_delta)); + if (abs (_current_delta) > _session->sample_rate()) { + int secs = rint ((double) _current_delta / _session->sample_rate()); + snprintf(delta, sizeof(delta), "\u0394%s%s%d s", + LEADINGZERO(abs(secs)), PLUSMINUS(-secs), abs(secs)); + } else { + snprintf (delta, sizeof(delta), "%s%s%lldsm", + sync_lock_broken ? "red" : "white", + LEADINGZERO(::llabs(_current_delta)), PLUSMINUS(-_current_delta), ::llabs(_current_delta)); + } } return delta;