Index: gtk2_ardour/editor_audio_import.cc =================================================================== --- gtk2_ardour/editor_audio_import.cc (revision 1560) +++ gtk2_ardour/editor_audio_import.cc (working copy) @@ -57,20 +57,27 @@ Editor::add_external_audio_action (ImportMode mode) { nframes_t& pos = edit_cursor->current_frame; - AudioTrack* track = 0; - if (!selection->tracks.empty()) { - AudioTimeAxisView* atv = dynamic_cast(selection->tracks.front()); + /* list of audio tracks and the next position on each track to place a new sound file */ + list tracks; + + for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + AudioTimeAxisView* atv = dynamic_cast(*i); if (atv) { - track = atv->audio_track(); + tracks.push_back (make_pair (atv->audio_track(), pos)); } } - bring_in_external_audio (mode, track, pos, false); + if (tracks.empty()) { + /* there aren't any tracks, so insert a dummy null one */ + tracks.push_back (make_pair ( (AudioTrack *) 0, pos)); + } + + bring_in_external_audio (mode, tracks, false); } void -Editor::bring_in_external_audio (ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt) +Editor::bring_in_external_audio (ImportMode mode, list& tracks, bool prompt) { if (session == 0) { MessageDialog msg (0, _("You can't import or embed an audiofile until you have a session loaded.")); @@ -83,11 +90,11 @@ switch (sfdb.run()) { case SoundFileOmega::ResponseImport: - do_import (sfdb.get_paths(), sfdb.get_split(), sfdb.get_mode(), track, pos, prompt); + do_import (sfdb.get_paths(), sfdb.get_split(), sfdb.get_mode(), tracks, prompt); break; case SoundFileOmega::ResponseEmbed: - do_embed (sfdb.get_paths(), sfdb.get_split(), sfdb.get_mode(), track, pos, prompt); + do_embed (sfdb.get_paths(), sfdb.get_split(), sfdb.get_mode(), tracks, prompt); break; default: @@ -96,7 +103,7 @@ } void -Editor::do_import (vector paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt) +Editor::do_import (vector paths, bool split, ImportMode mode, list& tracks, bool prompt) { /* SFDB sets "multichan" to true to indicate "split channels" so reverse the setting to match the way libardour @@ -111,24 +118,47 @@ vector to_import; + list::iterator track = tracks.begin(); for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { to_import.clear (); to_import.push_back (*a); - import_sndfile (to_import, mode, track, pos); + import_sndfile (to_import, mode, track); + + list::iterator tmp = track; + tmp++; + if (tmp != tracks.end()) { + track = tmp; + } } interthread_progress_window->hide_all (); } + +/** + * Front end for main do_embed () for convenience to some callers. + */ + void Editor::do_embed (vector paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt) { + list t; + t.push_back (make_pair (track, pos)); + do_embed (paths, split, mode, t, prompt); + pos = t.front().second; +} + + +void +Editor::do_embed (vector paths, bool split, ImportMode mode, std::list& tracks, bool prompt) +{ bool multiple_files = paths.size() > 1; bool check_sample_rate = true; vector::iterator a; + std::list::iterator track = tracks.begin(); for (a = paths.begin(); a != paths.end(); ) { cerr << "Considering embed of " << (*a) << endl; @@ -178,7 +208,7 @@ /* keep them paired */ - if (embed_sndfile (to_embed, split, multiple_files, check_sample_rate, mode, track, pos, prompt) < -1) { + if (embed_sndfile (to_embed, split, multiple_files, check_sample_rate, mode, track, prompt) < -1) { break; } @@ -193,7 +223,7 @@ foo.clear (); foo.push_back (*x); - if (embed_sndfile (foo, split, multiple_files, check_sample_rate, mode, track, pos, prompt) < -1) { + if (embed_sndfile (foo, split, multiple_files, check_sample_rate, mode, track, prompt) < -1) { break; } } @@ -201,10 +231,18 @@ } else { - if (embed_sndfile (to_embed, split, multiple_files, check_sample_rate, mode, track, pos, prompt) < -1) { + if (embed_sndfile (to_embed, split, multiple_files, check_sample_rate, mode, track, prompt) < -1) { break; } } + + list::iterator tmp = track; + tmp++; + if (tmp != tracks.end()) { + track = tmp; + } + + } if (a == paths.end()) { @@ -213,7 +251,7 @@ } int -Editor::import_sndfile (vector paths, ImportMode mode, AudioTrack* track, nframes_t& pos) +Editor::import_sndfile (vector paths, ImportMode mode, std::list::iterator track) { interthread_progress_window->set_title (string_compose (_("ardour: importing %1"), paths.front())); interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE); @@ -254,7 +292,7 @@ if (!import_status.new_regions.empty()) { boost::shared_ptr region (import_status.new_regions.front()); - finish_bringing_in_audio (region, region->n_channels(), region->n_channels(), track, pos, mode); + finish_bringing_in_audio (region, region->n_channels(), region->n_channels(), track, mode); } track_canvas.get_window()->set_cursor (*current_canvas_cursor); @@ -263,7 +301,7 @@ int Editor::embed_sndfile (vector paths, bool split, bool multiple_files, bool& check_sample_rate, ImportMode mode, - AudioTrack* track, nframes_t& pos, bool prompt) + list::iterator track, bool prompt) { boost::shared_ptr source; SourceList sources; @@ -393,7 +431,7 @@ } if (sources[0]->natural_position() != 0) { - pos = sources[0]->natural_position(); + track->second = sources[0]->natural_position(); } region_name = region_name_from_path (paths.front(), (sources.size() > 1)); @@ -407,7 +445,7 @@ output_chan = input_chan; } - finish_bringing_in_audio (region, input_chan, output_chan, track, pos, mode); + finish_bringing_in_audio (region, input_chan, output_chan, track, mode); out: track_canvas.get_window()->set_cursor (*current_canvas_cursor); @@ -415,7 +453,7 @@ } int -Editor::finish_bringing_in_audio (boost::shared_ptr region, uint32_t in_chans, uint32_t out_chans, AudioTrack* track, nframes_t& pos, ImportMode mode) +Editor::finish_bringing_in_audio (boost::shared_ptr region, uint32_t in_chans, uint32_t out_chans, std::list::iterator track, ImportMode mode) { switch (mode) { case ImportAsRegion: @@ -423,17 +461,17 @@ break; case ImportToTrack: - if (track) { - boost::shared_ptr playlist = track->diskstream()->playlist(); + if (track->first) { + boost::shared_ptr playlist = track->first->diskstream()->playlist(); boost::shared_ptr copy (boost::dynamic_pointer_cast (RegionFactory::create (region))); begin_reversible_command (_("insert sndfile")); XMLNode &before = playlist->get_state(); - playlist->add_region (copy, pos); + playlist->add_region (copy, track->second); session->add_command (new MementoCommand(*playlist, &before, &playlist->get_state())); commit_reversible_command (); - pos += region->length(); + track->second += region->length(); } break; @@ -442,7 +480,7 @@ list > at (session->new_audio_track (in_chans, out_chans, Normal, 1)); if (!at.empty()) { boost::shared_ptr copy (boost::dynamic_pointer_cast (RegionFactory::create (region))); - at.front()->diskstream()->playlist()->add_region (copy, pos); + at.front()->diskstream()->playlist()->add_region (copy, track->second); } break; } @@ -452,7 +490,7 @@ list > at (session->new_audio_track (in_chans, out_chans, Destructive)); if (!at.empty()) { boost::shared_ptr copy (boost::dynamic_pointer_cast (RegionFactory::create (region))); - at.front()->diskstream()->playlist()->add_region (copy, pos); + at.front()->diskstream()->playlist()->add_region (copy, track->second); } break; } Index: gtk2_ardour/editor.h =================================================================== --- gtk2_ardour/editor.h (revision 1560) +++ gtk2_ardour/editor.h (working copy) @@ -76,6 +76,7 @@ class Session; class AudioFilter; class Crossfade; + class AudioTrack; } namespace LADSPA { @@ -955,13 +956,16 @@ void add_external_audio_action (Editing::ImportMode); - void bring_in_external_audio (Editing::ImportMode mode, ARDOUR::AudioTrack*, nframes_t& pos, bool prompt); - void do_import (vector paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack*, nframes_t&, bool); - void do_embed (vector paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack*, nframes_t&, bool); - int import_sndfile (vector paths, Editing::ImportMode mode, ARDOUR::AudioTrack* track, nframes_t& pos); + typedef std::pair ImportTargetTrack; + + void bring_in_external_audio (Editing::ImportMode mode, std::list&, bool prompt); + void do_import (vector paths, bool split, Editing::ImportMode mode, std::list&, bool); + void do_embed (vector paths, bool split, Editing::ImportMode mode, std::list&, bool); + void do_embed (vector paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack* track, nframes_t& pos, bool); + int import_sndfile (vector paths, Editing::ImportMode mode, std::list::iterator track); int embed_sndfile (vector paths, bool split, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, - ARDOUR::AudioTrack* track, nframes_t& pos, bool prompt); - int finish_bringing_in_audio (boost::shared_ptr region, uint32_t, uint32_t, ARDOUR::AudioTrack* track, nframes_t& pos, Editing::ImportMode mode); + std::list::iterator track, bool prompt); + int finish_bringing_in_audio (boost::shared_ptr region, uint32_t, uint32_t, std::list::iterator track, Editing::ImportMode mode); /* generic interthread progress window */