From de542e9d296383829c572bdcc186f39e2b633056 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 11 Dec 2025 18:20:11 -0700 Subject: [PATCH] do not actually import newly-created SMF sources TO-DO: ensure the empty sources are somehow removed --- gtk2_ardour/editor_audio_import.cc | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index b900062125..6d1f5ab7f9 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -283,7 +283,7 @@ Editor::import_smf_tempo_map (Evoral::SMF const & smf, timepos_t const & pos) if (tmcb && !tmcb->empty()) { std::cerr << "CB\n"; - tmcb->dump (std::cerr); + tmcb->dump (std::cerr); wmap->paste (*tmcb, pos, false, _("import")); TempoMap::update (wmap); std::cerr << "final map\n"; @@ -743,7 +743,7 @@ Editor::embed_sndfiles (vector paths, int Editor::add_sources (vector paths, - SourceList& sources, + SourceList& possible_sources, timepos_t& pos, ImportDisposition disposition, ImportMode mode, @@ -763,6 +763,18 @@ Editor::add_sources (vector paths, use_timestamp = (pos == timepos_t::max (pos.time_domain())); + SourceList sources; + + for (auto const & s : possible_sources) { + if (!s->empty()) { + sources.push_back (s); + } + } + + if (sources.empty()) { + return -1; + } + // kludge (for MIDI we're abusing "channel" for "track" here) if (SMFSource::safe_midi_file_extension (paths.front())) { target_regions = -1; @@ -891,6 +903,7 @@ Editor::add_sources (vector paths, } regions.push_back (r); + ++n; } }