diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-01-06 02:14:17 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2017-01-06 02:14:17 +1100 |
| commit | 3060a458eb092ac5dd5fb86c0d57e435671d8766 (patch) | |
| tree | 558bf581449f56dcdd73520835f6e89347fb46d0 /gtk2_ardour/editor_audio_import.cc | |
| parent | a196ce68fdc62ca327a22179780e7314ac5b71ac (diff) | |
allow importing tempo maps at selected position.
Diffstat (limited to 'gtk2_ardour/editor_audio_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index a75ecad7e0..c835796325 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -262,7 +262,7 @@ Editor::get_nth_selected_midi_track (int nth) const } void -Editor::import_smf_tempo_map (Evoral::SMF const & smf) +Editor::import_smf_tempo_map (Evoral::SMF const & smf, framepos_t pos) { if (!_session) { return; @@ -296,8 +296,8 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf) } } else { - new_map.replace_tempo (new_map.tempo_section_at_frame (0), tempo, (t->time_pulses/smf.ppqn()) / 4.0, 0, TempoSection::Constant, AudioTime); - new_map.replace_meter (new_map.meter_section_at_frame (0), meter, bbt, 0, AudioTime); + 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); have_initial_meter = true; } @@ -340,7 +340,7 @@ Editor::do_import (vector<string> paths, continue; } if (smf.num_tempos() > 0) { - import_smf_tempo_map (smf); + import_smf_tempo_map (smf, pos); smf.close (); break; } |