From ebc7eabea2f513ad6050c8fbd735371d553f68cf Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 16 Dec 2016 14:57:14 +0000 Subject: add arguments (unusued) to control whether or not SMF tempo map is used during import --- gtk2_ardour/editor_canvas.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour/editor_canvas.cc') diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 53ab840ed8..bc457453bc 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -411,10 +411,11 @@ Editor::drop_paths_part_two (const vector& paths, framepos_t frame, doub frame = 0; InstrumentSelector is; // instantiation builds instrument-list and sets default. - do_import (midi_paths, Editing::ImportDistinctFiles, ImportAsTrack, SrcBest, SMFTrackName, frame, is.selected_instrument()); + do_import (midi_paths, Editing::ImportDistinctFiles, ImportAsTrack, SrcBest, SMFTrackName, SMFTempoIgnore, frame, is.selected_instrument()); if (UIConfiguration::instance().get_only_copy_imported_files() || copy) { - do_import (audio_paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, SrcBest, SMFTrackName, frame); + do_import (audio_paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, + SrcBest, SMFTrackName, SMFTempoIgnore, frame); } else { do_embed (audio_paths, Editing::ImportDistinctFiles, ImportAsTrack, frame); } @@ -427,10 +428,12 @@ Editor::drop_paths_part_two (const vector& paths, framepos_t frame, doub /* select the track, then embed/import */ selection->set (tv); - do_import (midi_paths, Editing::ImportSerializeFiles, ImportToTrack, SrcBest, SMFTrackName, frame); + do_import (midi_paths, Editing::ImportSerializeFiles, ImportToTrack, + SrcBest, SMFTrackName, SMFTempoIgnore, frame); if (UIConfiguration::instance().get_only_copy_imported_files() || copy) { - do_import (audio_paths, Editing::ImportSerializeFiles, Editing::ImportToTrack, SrcBest, SMFTrackName, frame); + do_import (audio_paths, Editing::ImportSerializeFiles, Editing::ImportToTrack, + SrcBest, SMFTrackName, SMFTempoIgnore, frame); } else { do_embed (audio_paths, Editing::ImportSerializeFiles, ImportToTrack, frame); } -- cgit v1.2.3