diff options
| author | Robin Gareus <robin@gareus.org> | 2020-05-12 14:59:44 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2020-05-12 14:59:44 +0200 |
| commit | fb203f3df8d6b062ac6c8cf71306c4c73f94a360 (patch) | |
| tree | ae20f5dcbd61bc57a63f3aec1bb59b056de23cd8 /libs/ardour/ltc_slave.cc | |
| parent | b36e6b8341ef8e044b1fbadd9462c454a82b85e3 (diff) | |
Consolidate delta-string format, avoid markup
Diffstat (limited to 'libs/ardour/ltc_slave.cc')
| -rw-r--r-- | libs/ardour/ltc_slave.cc | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc index bbd82c0556..266a9bc305 100644 --- a/libs/ardour/ltc_slave.cc +++ b/libs/ardour/ltc_slave.cc @@ -696,23 +696,11 @@ LTC_TransportMaster::position_string() const std::string LTC_TransportMaster::delta_string() const { - char delta[128]; - if (!_collect || current.timestamp == 0) { - snprintf (delta, sizeof(delta), "\u2012\u2012\u2012\u2012"); + return X_("\u2012\u2012\u2012\u2012"); } else if ((monotonic_cnt - current.timestamp) > 2 * samples_per_ltc_frame) { - snprintf (delta, sizeof(delta), "%s", _("flywheel")); + return _("flywheel"); } else { - if (abs (_current_delta) > ENGINE->sample_rate()) { - int secs = rint ((double) _current_delta / ENGINE->sample_rate()); - snprintf(delta, sizeof(delta), "\u0394<span face=\"monospace\" >%s%s%d</span><span face=\"monospace\"> s</span>", - LEADINGZERO(abs(secs)), PLUSMINUS(-secs), abs(secs)); - } else { - snprintf (delta, sizeof(delta), "\u0394<span %s face=\"monospace\" >%s%s%lld</span><span face=\"monospace\">sm</span>", - _sclock_synced && sync_lock_broken ? "foreground=\"red\"" : "", - PLUSMINUS(-_current_delta), LEADINGZERO(::llabs(_current_delta)), ::llabs(_current_delta)); - } + return format_delta_time (_current_delta); } - - return delta; } |