From 614977191030a4cfe9f1f32876b90467e22544b3 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 15 Oct 2024 22:35:04 -0600 Subject: [PATCH] fix yet more cases where SMF are imported and named incorrectly --- gtk2_ardour/editor_sources.cc | 2 +- gtk2_ardour/export_dialog.cc | 2 +- gtk2_ardour/trigger_page.cc | 4 ++-- libs/ardour/triggerbox.cc | 2 +- share/scripts/s_import_files.lua | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/editor_sources.cc b/gtk2_ardour/editor_sources.cc index dfeebc1a86..3d6a38a8bb 100644 --- a/gtk2_ardour/editor_sources.cc +++ b/gtk2_ardour/editor_sources.cc @@ -294,7 +294,7 @@ EditorSources::drag_data_received (const RefPtr& context, if (UIConfiguration::instance ().get_only_copy_imported_files () || copy) { _editor->do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, - SrcBest, SMFTrackNumber, SMFTempoIgnore, pos); + SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos); } else { _editor->do_embed (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, pos); } diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index ef466f4305..113a295da7 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -423,7 +423,7 @@ ExportDialog::show_progress () for (auto const& x : _files_to_reimport) { timepos_t pos (x.first); Editing::ImportDisposition disposition = Editing::ImportDistinctFiles; - editor.do_import (x.second, disposition, Editing::ImportAsTrack, SrcBest, SMFTrackNumber, SMFTempoIgnore, pos); + editor.do_import (x.second, disposition, Editing::ImportAsTrack, SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos); } } diff --git a/gtk2_ardour/trigger_page.cc b/gtk2_ardour/trigger_page.cc index db7ba152de..4857ce89a9 100644 --- a/gtk2_ardour/trigger_page.cc +++ b/gtk2_ardour/trigger_page.cc @@ -730,8 +730,8 @@ TriggerPage::drop_paths_part_two (std::vector paths) } timepos_t pos (0); Editing::ImportDisposition disposition = Editing::ImportSerializeFiles; // or Editing::ImportDistinctFiles // TODO use drop modifier? config? - PublicEditor::instance().do_import (midi_paths, disposition, Editing::ImportAsTrigger, SrcBest, SMFTrackNumber, SMFTempoIgnore, pos, _trigger_clip_picker.instrument_plugin ()); - PublicEditor::instance().do_import (audio_paths, disposition, Editing::ImportAsTrigger, SrcBest, SMFTrackNumber, SMFTempoIgnore, pos); + PublicEditor::instance().do_import (midi_paths, disposition, Editing::ImportAsTrigger, SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos, _trigger_clip_picker.instrument_plugin ()); + PublicEditor::instance().do_import (audio_paths, disposition, Editing::ImportAsTrigger, SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos); } bool diff --git a/libs/ardour/triggerbox.cc b/libs/ardour/triggerbox.cc index 7656be5a2f..12695e9241 100644 --- a/libs/ardour/triggerbox.cc +++ b/libs/ardour/triggerbox.cc @@ -3644,7 +3644,7 @@ TriggerBox::set_from_path (uint32_t slot, std::string const & path) status.replace_existing_source = false; status.split_midi_channels = false; status.import_markers = false; - status.midi_track_name_source = ARDOUR::SMFTrackNumber; + status.midi_track_name_source = ARDOUR::SMFFileAndTrackName; _session.import_files (status); diff --git a/share/scripts/s_import_files.lua b/share/scripts/s_import_files.lua index 2a2ce4f797..a402ea0809 100644 --- a/share/scripts/s_import_files.lua +++ b/share/scripts/s_import_files.lua @@ -8,7 +8,7 @@ function factory (params) return function () local pos = Temporal.timepos_t(0) Editor:do_import (files, Editing.ImportDistinctFiles, Editing.ImportAsTrack, ARDOUR.SrcQuality.SrcBest, - ARDOUR.MidiTrackNameSource.SMFTrackName, ARDOUR.MidiTempoMapDisposition.SMFTempoIgnore, + ARDOUR.MidiTrackNameSource.SMFFileAndTrackName, ARDOUR.MidiTempoMapDisposition.SMFTempoIgnore, pos, ARDOUR.PluginInfo(), ARDOUR.Track(), false) end end