diff options
| author | Robin Gareus <robin@gareus.org> | 2017-10-30 22:24:21 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-10-30 22:24:21 +0100 |
| commit | c5c4cd0246475d1e600d34c9de08a416b20d05a1 (patch) | |
| tree | f824e2e93bd57ae5549287df7b0f0a64196230a6 /gtk2_ardour/editor_audio_import.cc | |
| parent | ea8d089e3c1374da1cb693928bce01e5e722d1eb (diff) | |
Fix importing tempo-maps for non-integer pulsed time-signatures
Diffstat (limited to 'gtk2_ardour/editor_audio_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 2d668d214c..0ace7263e2 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -290,9 +290,9 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, samplepos_t pos) Timecode::BBT_Time bbt; /* 1|1|0 which is correct for the no-meter case */ if (have_initial_meter) { - new_map.add_tempo (tempo, (t->time_pulses/smf.ppqn()) / 4.0, 0, MusicTime); + new_map.add_tempo (tempo, t->time_pulses/ (double)smf.ppqn() / 4.0, 0, MusicTime); if (!(meter == last_meter)) { - bbt = new_map.bbt_at_quarter_note ((t->time_pulses/smf.ppqn())); + bbt = new_map.bbt_at_quarter_note (t->time_pulses/(double)smf.ppqn()); new_map.add_meter (meter, bbt, 0, MusicTime); } @@ -305,7 +305,7 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, samplepos_t pos) last_meter = meter; - cerr << "@ " << t->time_pulses/smf.ppqn() << " (" + cerr << "@ " << t->time_pulses/(double)smf.ppqn() << " (" << t->time_seconds << ") Add T " << tempo << " M " << meter << endl; } |