allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

successfully import SMF files with badly-formed time signature events

Browse Source
This commit is contained in:
Paul Davis
2026-01-09 18:00:37 -07:00
parent 3890eb7f0e
commit 9d2c755f69
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/evoral/SMF.cc
View File

@@ -860,11 +860,10 @@ SMF::tempo_map (bool& provided) const
Evoral::SMF::Tempo* t = nth_tempo (n);
assert (t);
Temporal::Tempo tempo (t->tempo(), 32.0 / (double) t->notes_per_note);
Temporal::Tempo tempo (t->tempo(), t->notes_per_note == 0 ? t->denominator : 32.0 / (double) t->notes_per_note);
Meter meter (t->numerator, t->denominator);
Beats beats (t->time_pulses / (uint64_t) ppqn(),
((t->time_pulses % (uint64_t) ppqn()) * ticks_per_beat) / ppqn());;
Beats beats (t->time_pulses / (uint64_t) ppqn(), ((t->time_pulses % (uint64_t) ppqn()) * ticks_per_beat) / ppqn());;
BBT_Argument bbt; /* 1|1|0 which is correct for the no-meter case */
superclock_t sc;
@@ -872,6 +871,7 @@ SMF::tempo_map (bool& provided) const
sc = 0;
} else {
sc = new_map->superclock_at (beats);
new_map->dump (std::cerr);
}
if (have_initial_meter) {
@@ -892,6 +892,10 @@ SMF::tempo_map (bool& provided) const
}
new_map->smf_end();
if (new_map->n_tempos() == 0 || new_map->n_meters() == 0) {
return nullptr;
}
provided = true;
return new_map;
}