smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-30 17:03:06 +01:00
Code Issues Projects Releases Wiki Activity

use new SMF::tempo_map() method when importing tempo map from SMF

Browse source
This commit is contained in:
Paul Davis 2024-02-02 10:10:17 -07:00
parent b35b30c230
commit 715ac5cd3a
1 changed files with 3 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

42
gtk2_ardour/editor_audio_import.cc
View file

@ -279,49 +279,13 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, timepos_t const & pos)
return;
}
const size_t num_tempos = smf.num_tempos ();
bool provided;
TempoMap::WritableSharedPtr new_map (smf.tempo_map (provided));
if (num_tempos == 0) {
if (!provided) {
return;
}
/* cannot create an empty TempoMap, so create one with "default" single
values for tempo and meter, then overwrite them.
*/
TempoMap::WritableSharedPtr new_map (new TempoMap (Tempo (120, 4), Meter (4, 4)));
Meter last_meter (4, 4);
bool have_initial_meter = false;
for (size_t n = 0; n < num_tempos; ++n) {
Evoral::SMF::Tempo* t = smf.nth_tempo (n);
assert (t);
Tempo tempo (t->tempo(), 32.0 / (double) t->notes_per_note);
Meter meter (t->numerator, t->denominator);
Temporal::BBT_Argument bbt; /* 1|1|0 which is correct for the no-meter case */
if (have_initial_meter) {
bbt = new_map->bbt_at (timepos_t (Temporal::Beats (int_div_round (t->time_pulses, (size_t) smf.ppqn()), 0)));
new_map->set_tempo (tempo, bbt);
if (!(meter == last_meter)) {
new_map->set_meter (meter, bbt);
}
} else {
new_map->set_meter (meter, bbt);
new_map->set_tempo (tempo, bbt);
have_initial_meter = true;
}
last_meter = meter;
}
TempoMap::WritableSharedPtr wmap = TempoMap::write_copy ();
TempoMapCutBuffer* tmcb;
// XMLNode& tm_before (wmap->get_state());