ardour/livetrax
13
0
Fork 0
Code

use centralized SMF tempo method in both places where we show it

Browse Source
This commit is contained in:
Paul Davis 2017-02-08 19:07:28 +01:00
parent 994f5cec0e
commit f4cb567fdb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_audio_import.cc
View File

@ -285,7 +285,7 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, framepos_t pos)
Evoral::SMF::Tempo* t = smf.nth_tempo (n); Evoral::SMF::Tempo* t = smf.nth_tempo (n);
assert (t); 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); Meter meter (t->numerator, t->denominator);
Timecode::BBT_Time bbt; /* 1|1|0 which is correct for the no-meter case */ Timecode::BBT_Time bbt; /* 1|1|0 which is correct for the no-meter case */

2
gtk2_ardour/sfdb_ui.cc
View File

@ -344,7 +344,7 @@ SoundFileBox::setup_labels (const string& filename)
tempomap_value.set_text (string_compose (_("%1/%2 \u2669 = %3"), tempomap_value.set_text (string_compose (_("%1/%2 \u2669 = %3"),
t->numerator, t->numerator,
t->denominator, t->denominator,
(1000000 / t->microseconds_per_quarter_note) * 60)); t->tempo ()));
break; break;
} }
default: default: