diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-02-26 02:22:19 +1100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-02-27 20:16:10 +0100 |
| commit | 97c4c2a28c19b7979ecbfd2eff28a351dfae1e6a (patch) | |
| tree | 01a697ce2c07e532170288d33fae384d07b4f8ce /gtk2_ardour/editor_audio_import.cc | |
| parent | ac19a51d38906f347baeb767d9b011955030921c (diff) | |
complete changes to tempo type.
- this implements in the intention behind the previous commit.
a tempo mark is constant until its end has been changed by a
shift-drag on the next marker.
Diffstat (limited to 'gtk2_ardour/editor_audio_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index d006b2ca15..adbb113aac 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -290,7 +290,7 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, framepos_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, TempoSection::Constant, MusicTime); + new_map.add_tempo (tempo, (t->time_pulses/smf.ppqn()) / 4.0, 0, MusicTime); if (!(meter == last_meter)) { bbt = new_map.bbt_at_quarter_note ((t->time_pulses/smf.ppqn())); new_map.add_meter (meter, t->time_pulses, bbt, 0, MusicTime); @@ -298,7 +298,7 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, framepos_t pos) } else { new_map.replace_meter (new_map.meter_section_at_frame (0), meter, bbt, pos, AudioTime); - new_map.replace_tempo (new_map.tempo_section_at_frame (0), tempo, 0.0, pos, TempoSection::Constant, AudioTime); + new_map.replace_tempo (new_map.tempo_section_at_frame (0), tempo, 0.0, pos, AudioTime); have_initial_meter = true; } |