From f4cb567fdb7781417fb729cda65a6410bd062c86 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 8 Feb 2017 19:07:28 +0100 Subject: [PATCH] use centralized SMF tempo method in both places where we show it --- gtk2_ardour/editor_audio_import.cc | 2 +- gtk2_ardour/sfdb_ui.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 1bbcf80b6f..d006b2ca15 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -285,7 +285,7 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, framepos_t pos) Evoral::SMF::Tempo* t = smf.nth_tempo (n); assert (t); - Tempo tempo (60 * (1000000 / (double) t->microseconds_per_quarter_note), 4.0); + Tempo tempo (t->tempo(), 4.0); Meter meter (t->numerator, t->denominator); Timecode::BBT_Time bbt; /* 1|1|0 which is correct for the no-meter case */ diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index d3979959fd..fd08e14419 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -344,7 +344,7 @@ SoundFileBox::setup_labels (const string& filename) tempomap_value.set_text (string_compose (_("%1/%2 \u2669 = %3"), t->numerator, t->denominator, - (1000000 / t->microseconds_per_quarter_note) * 60)); + t->tempo ())); break; } default: