ardour/livetrax
13
0
Fork 0
Code

fix yet more cases where SMF are imported and named incorrectly

Browse Source
This commit is contained in:
Paul Davis 2024-10-15 22:35:04 -06:00
parent 5c2e1bd807
commit 6149771910
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_sources.cc
View File

@ -294,7 +294,7 @@ EditorSources::drag_data_received (const RefPtr<Gdk::DragContext>& context,
if (UIConfiguration::instance ().get_only_copy_imported_files () || copy) { if (UIConfiguration::instance ().get_only_copy_imported_files () || copy) {
_editor->do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, _editor->do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion,
SrcBest, SMFTrackNumber, SMFTempoIgnore, pos); SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos);
} else { } else {
_editor->do_embed (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, pos); _editor->do_embed (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, pos);
} }

2
gtk2_ardour/export_dialog.cc
View File

@ -423,7 +423,7 @@ ExportDialog::show_progress ()
for (auto const& x : _files_to_reimport) { for (auto const& x : _files_to_reimport) {
timepos_t pos (x.first); timepos_t pos (x.first);
Editing::ImportDisposition disposition = Editing::ImportDistinctFiles; 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);
} }
} }

4
gtk2_ardour/trigger_page.cc
View File

@ -730,8 +730,8 @@ TriggerPage::drop_paths_part_two (std::vector<std::string> paths)
} }
timepos_t pos (0); timepos_t pos (0);
Editing::ImportDisposition disposition = Editing::ImportSerializeFiles; // or Editing::ImportDistinctFiles // TODO use drop modifier? config? 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 (midi_paths, disposition, Editing::ImportAsTrigger, SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos, _trigger_clip_picker.instrument_plugin ());
PublicEditor::instance().do_import (audio_paths, disposition, Editing::ImportAsTrigger, SrcBest, SMFTrackNumber, SMFTempoIgnore, pos); PublicEditor::instance().do_import (audio_paths, disposition, Editing::ImportAsTrigger, SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos);
} }
bool bool

2
libs/ardour/triggerbox.cc
View File

@ -3644,7 +3644,7 @@ TriggerBox::set_from_path (uint32_t slot, std::string const & path)
status.replace_existing_source = false; status.replace_existing_source = false;
status.split_midi_channels = false; status.split_midi_channels = false;
status.import_markers = false; status.import_markers = false;
status.midi_track_name_source = ARDOUR::SMFTrackNumber; status.midi_track_name_source = ARDOUR::SMFFileAndTrackName;
_session.import_files (status); _session.import_files (status);

2
share/scripts/s_import_files.lua
View File

@ -8,7 +8,7 @@ function factory (params) return function ()
local pos = Temporal.timepos_t(0) local pos = Temporal.timepos_t(0)
Editor:do_import (files, Editor:do_import (files,
Editing.ImportDistinctFiles, Editing.ImportAsTrack, ARDOUR.SrcQuality.SrcBest, 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) pos, ARDOUR.PluginInfo(), ARDOUR.Track(), false)
end end end end