additional DEBUG_TRACE output for slave/diskreader
[ardour.git] / gtk2_ardour / editor_audio_import.cc
index ee73c46b244f485955c7bf9324f930868846fc0a..0ee0810ff29f855885463f5b3d396c25b5fc4fc8 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2006 Paul Davis 
+    Copyright (C) 2000-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
-#include <pbd/pthread_utils.h>
-#include <pbd/basename.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <errno.h>
+#include <unistd.h>
+#include <algorithm>
 
-#include <gtkmm2ext/choice.h>
+#include <sndfile.h>
 
-#include <ardour/session.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audioregion.h>
-#include <ardour/diskstream.h>
-#include <ardour/filesource.h>
-#include <ardour/externalsource.h>
-#include <ardour/utils.h>
-#include <ardour/audio_track.h>
-#include <ardour/audioplaylist.h>
+#include "pbd/pthread_utils.h"
+#include "pbd/basename.h"
+#include "pbd/shortpath.h"
+#include "pbd/stateful_diff_command.h"
+
+#include "widgets/choice.h"
+
+#include "ardour/audio_track.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/audioregion.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_track.h"
+#include "ardour/operations.h"
+#include "ardour/profile.h"
+#include "ardour/region_factory.h"
+#include "ardour/smf_source.h"
+#include "ardour/source_factory.h"
+#include "ardour/utils.h"
+#include "pbd/memento_command.h"
 
 #include "ardour_ui.h"
+#include "cursor_context.h"
 #include "editor.h"
 #include "sfdb_ui.h"
 #include "editing.h"
 #include "audio_time_axis.h"
+#include "midi_time_axis.h"
+#include "session_import_dialog.h"
+#include "gui_thread.h"
+#include "interthread_progress_window.h"
+#include "mouse_cursors.h"
+#include "editor_cursors.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
-using namespace sigc;
+using namespace PBD;
 using namespace Gtk;
+using namespace Gtkmm2ext;
 using namespace Editing;
+using std::string;
 
 /* Functions supporting the incorporation of external (non-captured) audio material into ardour */
 
 void
-Editor::add_external_audio_action (ImportMode mode)
+Editor::add_external_audio_action (ImportMode mode_hint)
+{
+       if (_session == 0) {
+               MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded."));
+               msg.run ();
+               return;
+       }
+
+       if (sfbrowser == 0) {
+               sfbrowser = new SoundFileOmega (_("Add Existing Media"), _session, 0, 0, true, mode_hint);
+       } else {
+               sfbrowser->set_mode (mode_hint);
+       }
+
+       external_audio_dialog ();
+}
+
+void
+Editor::external_audio_dialog ()
 {
-       jack_nframes_t& pos = edit_cursor->current_frame;
-       AudioTrack* track = 0;
+       vector<string> paths;
+       uint32_t audio_track_cnt;
+       uint32_t midi_track_cnt;
+
+       if (_session == 0) {
+               MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded."));
+               msg.run ();
+               return;
+       }
+
+       audio_track_cnt = 0;
+       midi_track_cnt = 0;
+
+       for (TrackSelection::iterator x = selection->tracks.begin(); x != selection->tracks.end(); ++x) {
+               AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(*x);
 
-       if (!selection->tracks.empty()) {
-               AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(selection->tracks.front());
                if (atv) {
-                       track = atv->audio_track();
+                       if (atv->is_audio_track()) {
+                               audio_track_cnt++;
+                       }
+
+               } else {
+                       MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*>(*x);
+
+                       if (mtv) {
+                               if (mtv->is_midi_track()) {
+                                       midi_track_cnt++;
+                               }
+                       }
                }
        }
 
-       bring_in_external_audio (mode, track, pos, false);
+       if (sfbrowser == 0) {
+               sfbrowser = new SoundFileOmega (_("Add Existing Media"), _session, audio_track_cnt, midi_track_cnt, true);
+       } else {
+               sfbrowser->reset (audio_track_cnt, midi_track_cnt);
+       }
+
+       sfbrowser->show_all ();
 }
 
 void
-Editor::bring_in_external_audio (ImportMode mode, AudioTrack* track, jack_nframes_t& pos, bool prompt)
+Editor::session_import_dialog ()
 {
-       if (session == 0) {
-               MessageDialog msg (0, _("You can't import or embed an audiofile until you have a session loaded."));
-               msg.run ();
+       SessionImportDialog dialog (_session);
+       dialog.run ();
+}
+
+typedef std::map<PBD::ID,boost::shared_ptr<ARDOUR::Source> > SourceMap;
+
+/**
+ * Updating is still disabled, see note in libs/ardour/import.cc Session::import_files()
+ *
+ * all_or_nothing:
+ *   true  = show "Update", "Import" and "Skip"
+ *   false = show "Import", and "Cancel"
+ *
+ * Returns:
+ *     0  To update an existing source of the same name
+ *     1  To import/embed the file normally (make sure the new name will be unique)
+ *     2  If the user wants to skip this file
+ **/
+int
+Editor::check_whether_and_how_to_import(string path, bool all_or_nothing)
+{
+       string wave_name (Glib::path_get_basename(path));
+
+       bool already_exists = false;
+       uint32_t existing;
+
+       if ((existing = _session->count_sources_by_origin (path)) > 0) {
+               already_exists = true;
+       }
+
+       int function = 1;
+
+       if (already_exists) {
+               string message;
+               if (all_or_nothing) {
+                       // updating is still disabled
+                       //message = string_compose(_("The session already contains a source file named %1. Do you want to update that file (and thus all regions using the file) or import this file as a new file?"),wave_name);
+                       message = string_compose (_("The session already contains a source file named %1.  Do you want to import %1 as a new file, or skip it?"), wave_name);
+               } else {
+                       message = string_compose (_("The session already contains a source file named %1.  Do you want to import %2 as a new source, or skip it?"), wave_name, wave_name);
+
+               }
+               MessageDialog dialog(message, false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true);
+
+               if (all_or_nothing) {
+                       // disabled
+                       //dialog.add_button("Update", 0);
+                       dialog.add_button("Import", 1);
+                       dialog.add_button("Skip",   2);
+               } else {
+                       dialog.add_button("Import", 1);
+                       dialog.add_button("Cancel", 2);
+               }
+
+               //dialog.add_button("Skip all", 4); // All or rest?
+
+               dialog.show();
+
+               function = dialog.run ();
+
+               dialog.hide();
+       }
+
+       return function;
+}
+
+boost::shared_ptr<AudioTrack>
+Editor::get_nth_selected_audio_track (int nth) const
+{
+       AudioTimeAxisView* atv;
+       TrackSelection::iterator x;
+
+       for (x = selection->tracks.begin(); nth > 0 && x != selection->tracks.end(); ++x) {
+
+               atv = dynamic_cast<AudioTimeAxisView*>(*x);
+
+               if (!atv) {
+                       continue;
+               } else if (atv->is_audio_track()) {
+                       --nth;
+               }
+       }
+
+       if (x == selection->tracks.end()) {
+               atv = dynamic_cast<AudioTimeAxisView*>(selection->tracks.back());
+       } else {
+               atv = dynamic_cast<AudioTimeAxisView*>(*x);
+       }
+
+       if (!atv || !atv->is_audio_track()) {
+               return boost::shared_ptr<AudioTrack>();
+       }
+
+       return atv->audio_track();
+}
+
+boost::shared_ptr<MidiTrack>
+Editor::get_nth_selected_midi_track (int nth) const
+{
+       MidiTimeAxisView* mtv;
+       TrackSelection::iterator x;
+
+       for (x = selection->tracks.begin(); nth > 0 && x != selection->tracks.end(); ++x) {
+
+               mtv = dynamic_cast<MidiTimeAxisView*>(*x);
+
+               if (!mtv) {
+                       continue;
+               } else if (mtv->is_midi_track()) {
+                       --nth;
+               }
+       }
+
+       if (x == selection->tracks.end()) {
+               mtv = dynamic_cast<MidiTimeAxisView*>(selection->tracks.back());
+       } else {
+               mtv = dynamic_cast<MidiTimeAxisView*>(*x);
+       }
+
+       if (!mtv || !mtv->is_midi_track()) {
+               return boost::shared_ptr<MidiTrack>();
+       }
+
+       return mtv->midi_track();
+}
+
+void
+Editor::import_smf_tempo_map (Evoral::SMF const & smf, framepos_t pos)
+{
+       if (!_session) {
                return;
        }
 
-       SoundFileOmega sfdb (_("Add existing audio to session"), session);
-       sfdb.set_mode (mode);
+       const size_t num_tempos = smf.num_tempos ();
 
-       switch (sfdb.run()) {
-       case SoundFileOmega::ResponseImport:
-               do_import (sfdb.get_paths(), sfdb.get_split(), mode, track, pos, prompt);
-               break;
-               
-       case SoundFileOmega::ResponseEmbed:
-               do_embed (sfdb.get_paths(), sfdb.get_split(), mode, track, pos, prompt);
-               break;
+       if (num_tempos == 0) {
+               return;
+       }
 
-       default:
-               break;
+       const framecnt_t sample_rate = _session->frame_rate ();
+       TempoMap new_map (sample_rate);
+       Meter last_meter (4.0, 4.0);
+       bool have_initial_meter = false;
+
+       for (size_t n = 0; n < num_tempos; ++n) {
+
+               Evoral::SMF::Tempo* t = smf.nth_tempo (n);
+               assert (t);
+
+               Tempo tempo (t->tempo(), 32.0 / (double) t->notes_per_note);
+               Meter meter (t->numerator, t->denominator);
+               Timecode::BBT_Time bbt; /* 1|1|0 which is correct for the no-meter case */
+
+               if (have_initial_meter) {
+                       new_map.add_tempo (tempo, (t->time_pulses/smf.ppqn()) / 4.0, 0, MusicTime);
+                       if (!(meter == last_meter)) {
+                               bbt = new_map.bbt_at_quarter_note ((t->time_pulses/smf.ppqn()));
+                               new_map.add_meter (meter, bbt, 0, MusicTime);
+                       }
+
+               } else {
+                       new_map.replace_meter (new_map.meter_section_at_frame (0), meter, bbt, pos, AudioTime);
+                       new_map.replace_tempo (new_map.tempo_section_at_frame (0), tempo, 0.0, pos, AudioTime);
+                       have_initial_meter = true;
+
+               }
+
+               last_meter = meter;
+
+               cerr << "@ " << t->time_pulses/smf.ppqn() << " ("
+                    << t->time_seconds << ") Add T " << tempo << " M " << meter << endl;
        }
+
+       cerr << "NEW MAP:\n";
+       new_map.dump (cerr);
+
+       _session->tempo_map() = new_map;
 }
 
 void
-Editor::do_import (vector<Glib::ustring> paths, bool split, ImportMode mode, AudioTrack* track, jack_nframes_t& pos, bool prompt)
+Editor::do_import (vector<string>        paths,
+                   ImportDisposition     disposition,
+                   ImportMode            mode,
+                   SrcQuality            quality,
+                   MidiTrackNameSource   midi_track_name_source,
+                   MidiTempoMapDisposition smf_tempo_disposition,
+                   framepos_t&           pos,
+                   ARDOUR::PluginInfoPtr instrument)
 {
-       /* SFDB sets "multichan" to true to indicate "split channels"
-          so reverse the setting to match the way libardour
-          interprets it.
-       */
-       
-       import_status.multichan = !split;
+       boost::shared_ptr<Track> track;
+       vector<string> to_import;
+       int nth = 0;
+       bool use_timestamp = (pos == -1);
 
-       if (interthread_progress_window == 0) {
-               build_interthread_progress_window ();
+       if (smf_tempo_disposition == SMFTempoUse) {
+               /* Find the first MIDI file with a tempo map, and import it
+                  before we do anything else.
+               */
+
+               for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) {
+                       Evoral::SMF smf;
+                       if (smf.open (*a)) {
+                               continue;
+                       }
+                       if (smf.num_tempos() > 0) {
+                               import_smf_tempo_map (smf, pos);
+                               smf.close ();
+                               break;
+                       }
+                       smf.close ();
+               }
+       }
+
+       current_interthread_info = &import_status;
+       import_status.current = 1;
+       import_status.total = paths.size ();
+       import_status.all_done = false;
+       import_status.midi_track_name_source = midi_track_name_source;
+
+       ImportProgressWindow ipw (&import_status, _("Import"), _("Cancel Import"));
+
+       bool ok = true;
+
+       if (disposition == Editing::ImportMergeFiles) {
+
+               /* create 1 region from all paths, add to 1 track,
+                  ignore "track"
+               */
+
+               bool cancel = false;
+               for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) {
+                       int check = check_whether_and_how_to_import(*a, false);
+                       if (check == 2) {
+                               cancel = true;
+                               break;
+                       }
+               }
+
+               if (cancel) {
+                       ok = false;
+               } else {
+                       ipw.show ();
+                       ok = (import_sndfiles (paths, disposition, mode, quality, pos, 1, 1, track, false, instrument) == 0);
+                       import_status.sources.clear();
+               }
+
+       } else {
+
+               bool replace = false;
+
+               for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) {
+
+                       const int check = check_whether_and_how_to_import (*a, true);
+
+                       switch (check) {
+                       case 2:
+                               // user said skip
+                               continue;
+                       case 0:
+                               fatal << "Updating existing sources should be disabled!" << endmsg;
+                               abort(); /* NOTREACHED*/
+                               break;
+                       case 1:
+                               replace = false;
+                               break;
+                       default:
+                               fatal << "Illegal return " << check <<  " from check_whether_and_how_to_import()!" << endmsg;
+                               abort(); /* NOTREACHED*/
+                       }
+
+                       /* have to reset this for every file we handle */
+
+                       if (use_timestamp) {
+                               pos = -1;
+                       }
+
+                       ipw.show ();
+
+                       switch (disposition) {
+                       case Editing::ImportDistinctFiles:
+
+                               to_import.clear ();
+                               to_import.push_back (*a);
+
+                               if (mode == Editing::ImportToTrack) {
+                                       track = get_nth_selected_audio_track (nth++);
+                               }
+
+                               ok = (import_sndfiles (to_import, disposition, mode, quality, pos, 1, -1, track, replace, instrument) == 0);
+                               import_status.sources.clear();
+                               break;
+
+                       case Editing::ImportDistinctChannels:
+
+                               to_import.clear ();
+                               to_import.push_back (*a);
+
+                               ok = (import_sndfiles (to_import, disposition, mode, quality, pos, -1, -1, track, replace, instrument) == 0);
+                               import_status.sources.clear();
+                               break;
+
+                       case Editing::ImportSerializeFiles:
+
+                               to_import.clear ();
+                               to_import.push_back (*a);
+
+                               ok = (import_sndfiles (to_import, disposition, mode, quality, pos, 1, 1, track, replace, instrument) == 0);
+                               import_status.sources.clear();
+                               break;
+
+                       case Editing::ImportMergeFiles:
+                               // Not entered, handled in earlier if() branch
+                               break;
+                       }
+               }
        }
-       
-       /* for each path that was selected, import it and then potentially create a new track
-          containing the new region as the sole contents.
-       */
 
-       for (vector<Glib::ustring>::iterator i = paths.begin(); i != paths.end(); ++i ) {
-               import_sndfile (*i, mode, track, pos);
+       if (ok) {
+               _session->save_state ("");
        }
 
-       interthread_progress_window->hide_all ();
+       import_status.all_done = true;
 }
 
 void
-Editor::do_embed (vector<Glib::ustring> paths, bool split, ImportMode mode, AudioTrack* track, jack_nframes_t& pos, bool prompt)
+Editor::do_embed (vector<string> paths, ImportDisposition import_as, ImportMode mode, framepos_t& pos, ARDOUR::PluginInfoPtr instrument)
 {
-       bool multiple_files = paths.size() > 1;
+       boost::shared_ptr<Track> track;
        bool check_sample_rate = true;
-       vector<Glib::ustring>::iterator i;
-       
-       for (i = paths.begin(); i != paths.end(); ++i) {
-               int ret = embed_sndfile (*i, split, multiple_files, check_sample_rate, mode, track, pos, prompt);
+       bool ok = false;
+       vector<string> to_embed;
+       bool multi = paths.size() > 1;
+       int nth = 0;
+       bool use_timestamp = (pos == -1);
+
+       switch (import_as) {
+       case Editing::ImportDistinctFiles:
+               for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) {
+
+                       /* have to reset this for every file we handle */
+                       if (use_timestamp) {
+                               pos = -1;
+                       }
+
+                       to_embed.clear ();
+                       to_embed.push_back (*a);
 
-               if (ret < -1) {
-                       break;
+                       if (mode == Editing::ImportToTrack) {
+                               track = get_nth_selected_audio_track (nth++);
+                       }
+
+                       if (embed_sndfiles (to_embed, multi, check_sample_rate, import_as, mode, pos, 1, -1, track, instrument) < -1) {
+                               goto out;
+                       }
                }
+               break;
+
+       case Editing::ImportDistinctChannels:
+               for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) {
+
+                       /* have to reset this for every file we handle */
+                       if (use_timestamp) {
+                               pos = -1;
+                       }
+
+                       to_embed.clear ();
+                       to_embed.push_back (*a);
+
+                       if (embed_sndfiles (to_embed, multi, check_sample_rate, import_as, mode, pos, -1, -1, track, instrument) < -1) {
+                               goto out;
+                       }
+               }
+               break;
+
+       case Editing::ImportMergeFiles:
+               if (embed_sndfiles (paths, multi, check_sample_rate, import_as, mode, pos, 1, 1, track, instrument) < -1) {
+                       goto out;
+               }
+               break;
+
+       case Editing::ImportSerializeFiles:
+               for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) {
+
+                       /* have to reset this for every file we handle */
+                       if (use_timestamp) {
+                               pos = -1;
+                       }
+
+                       to_embed.clear ();
+                       to_embed.push_back (*a);
+
+                       if (embed_sndfiles (to_embed, multi, check_sample_rate, import_as, mode, pos, 1, 1, track, instrument) < -1) {
+                               goto out;
+                       }
+               }
+               break;
        }
 
-       if (i == paths.end()) {
-               session->save_state ("");
+       ok = true;
+
+  out:
+       if (ok) {
+               _session->save_state ("");
        }
 }
 
 int
-Editor::import_sndfile (Glib::ustring path, ImportMode mode, AudioTrack* track, jack_nframes_t& pos)
+Editor::import_sndfiles (vector<string>            paths,
+                         ImportDisposition         disposition,
+                         ImportMode                mode,
+                         SrcQuality                quality,
+                         framepos_t&               pos,
+                         int                       target_regions,
+                         int                       target_tracks,
+                         boost::shared_ptr<Track>& track,
+                         bool                      replace,
+                         ARDOUR::PluginInfoPtr     instrument)
 {
-       interthread_progress_window->set_title (string_compose (_("ardour: importing %1"), path));
-       interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE);
-       interthread_progress_window->show_all ();
-       interthread_progress_bar.set_fraction (0.0f);
-       interthread_cancel_label.set_text (_("Cancel Import"));
-       current_interthread_info = &import_status;
-
-       import_status.pathname = path;
+       import_status.paths = paths;
        import_status.done = false;
        import_status.cancel = false;
        import_status.freeze = false;
-       import_status.done = 0.0;
-       
-       interthread_progress_connection = Glib::signal_timeout().connect 
-               (bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 100);
-       
-       track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
-       ARDOUR_UI::instance()->flush_pending ();
-
-       /* start import thread for this path. this will ultimately call Session::import_audiofile()
-          and if successful will add the file as a region to the session region list.
+       import_status.quality = quality;
+       import_status.replace_existing_source = replace;
+       import_status.split_midi_channels = (disposition == Editing::ImportDistinctChannels);
+
+       import_status.mode = mode;
+       import_status.pos = pos;
+       import_status.target_tracks = target_tracks;
+       import_status.target_regions = target_regions;
+       import_status.track = track;
+       import_status.replace = replace;
+
+       CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
+       gdk_flush ();
+
+       /* start import thread for this spec. this will ultimately call Session::import_files()
+          which, if successful, will add the files as regions to the region list. its up to us
+          (the GUI) to direct additional steps after that.
        */
-       
-       pthread_create_and_store ("import", &import_status.thread, 0, _import_thread, this);
+
+       pthread_create_and_store ("import", &import_status.thread, _import_thread, this);
        pthread_detach (import_status.thread);
-       
-       while (!(import_status.done || import_status.cancel)) {
+
+       while (!import_status.done && !import_status.cancel) {
                gtk_main_iteration ();
        }
-       
-       import_status.done = true;
-       interthread_progress_connection.disconnect ();
-       
-       /* import thread finished - see if we should build a new track */
-       
-       if (!import_status.new_regions.empty()) {
-               AudioRegion& region (*import_status.new_regions.front());
-               finish_bringing_in_audio (region, region.n_channels(), region.n_channels(), track, pos, mode);
+
+       // wait for thread to terminate
+       while (!import_status.done) {
+               gtk_main_iteration ();
        }
 
-       track_canvas.get_window()->set_cursor (*current_canvas_cursor);
-       return 0;
+       int result = -1;
+
+       if (!import_status.cancel && !import_status.sources.empty()) {
+               result = add_sources (
+                       import_status.paths,
+                       import_status.sources,
+                       import_status.pos,
+                       disposition,
+                       import_status.mode,
+                       import_status.target_regions,
+                       import_status.target_tracks,
+                       track, false, instrument
+                       );
+
+               /* update position from results */
+
+               pos = import_status.pos;
+       }
+
+       return result;
 }
 
 int
-Editor::embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool& check_sample_rate, ImportMode mode, 
-                      AudioTrack* track, jack_nframes_t& pos, bool prompt)
+Editor::embed_sndfiles (vector<string>            paths,
+                        bool                      multifile,
+                        bool&                     check_sample_rate,
+                        ImportDisposition         disposition,
+                        ImportMode                mode,
+                        framepos_t&               pos,
+                        int                       target_regions,
+                        int                       target_tracks,
+                        boost::shared_ptr<Track>& track,
+                        ARDOUR::PluginInfoPtr     instrument)
 {
-       ExternalSource *source = 0; /* keep g++ quiet */
-       AudioRegion::SourceList sources;
-       AudioRegion* region;
-       string idspec;
+       boost::shared_ptr<AudioFileSource> source;
+       SourceList sources;
        string linked_path;
        SoundFileInfo finfo;
-       string region_name;
-       uint32_t input_chan;
-       uint32_t output_chan;
 
-       track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
-       ARDOUR_UI::instance()->flush_pending ();
+       CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
+       gdk_flush ();
 
-       /* lets see if we can link it into the session */
-       
-       linked_path = session->sound_dir();
-       linked_path += Glib::path_get_basename (path);
+       for (vector<string>::iterator p = paths.begin(); p != paths.end(); ++p) {
 
-       if (link (path.c_str(), linked_path.c_str()) == 0) {
+               string path = *p;
+               string error_msg;
 
-               /* there are many reasons why link(2) might have failed.
-                  but if it succeeds, we now have a link in the
-                  session sound dir that will protect against
-                  unlinking of the original path. nice.
-               */
+               /* note that we temporarily truncated _id at the colon */
+
+               if (!AudioFileSource::get_soundfile_info (path, finfo, error_msg)) {
+                       error << string_compose(_("Editor: cannot open file \"%1\", (%2)"), path, error_msg ) << endmsg;
+                       return -3;
+               }
+
+               if (check_sample_rate  && (finfo.samplerate != (int) _session->frame_rate())) {
+                       vector<string> choices;
+
+                       if (multifile) {
+                               choices.push_back (_("Cancel entire import"));
+                               choices.push_back (_("Don't embed it"));
+                               choices.push_back (_("Embed all without questions"));
+
+                               ArdourWidgets::Choice rate_choice (
+                                       _("Sample rate"),
+                                       string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"),
+                                                       short_path (path, 40)),
+                                       choices, false
+                                       );
+
+                               int resx = rate_choice.run ();
+
+                               switch (resx) {
+                               case 0: /* stop a multi-file import */
+                                       return -2;
+                               case 1: /* don't embed this one */
+                                       return -1;
+                               case 2: /* do it, and the rest without asking */
+                                       check_sample_rate = false;
+                                       break;
+                               case 3: /* do it */
+                                       break;
+                               default:
+                                       return -2;
+                               }
+                       } else {
+                               choices.push_back (_("Cancel"));
+                               choices.push_back (_("Embed it anyway"));
+
+                               ArdourWidgets::Choice rate_choice (
+                                       _("Sample rate"),
+                                       string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
+                                       choices, false
+                                       );
+
+                               int resx = rate_choice.run ();
+
+                               switch (resx) {
+                               case 0: /* don't import */
+                                       return -1;
+                               case 1: /* do it */
+                                       break;
+                               default:
+                                       return -2;
+                               }
+                       }
+               }
+
+               for (int n = 0; n < finfo.channels; ++n) {
+
+                       try {
+
+                               /* check if we have this thing embedded already */
+
+                               boost::shared_ptr<Source> s;
+
+                               if ((s = _session->audio_source_by_path_and_channel (path, n)) == 0) {
 
-               path = linked_path;
+                                       source = boost::dynamic_pointer_cast<AudioFileSource> (
+                                               SourceFactory::createExternal (DataType::AUDIO, *_session,
+                                                                              path, n,
+                                                                              (mode == ImportAsTapeTrack
+                                                                               ? Source::Destructive
+                                                                               : Source::Flag (0)),
+                                                                       true, true));
+                               } else {
+                                       source = boost::dynamic_pointer_cast<AudioFileSource> (s);
+                               }
+
+                               sources.push_back(source);
+                       }
+
+                       catch (failed_constructor& err) {
+                               error << string_compose(_("could not open %1"), path) << endmsg;
+                               return -3;
+                       }
+
+                       gtk_main_iteration();
+               }
        }
 
-       /* note that we temporarily truncated _id at the colon */
+       if (!sources.empty()) {
+               return add_sources (paths, sources, pos, disposition, mode, target_regions, target_tracks, track, true, instrument);
+       }
 
-       string error_msg;
+       return 0;
+}
 
-       if (!ExternalSource::get_soundfile_info (path, finfo, error_msg)) {
-               error << string_compose(_("Editor: cannot open file \"%1\", (%2)"), selection, error_msg ) << endmsg;
-               return 0;
+int
+Editor::add_sources (vector<string>            paths,
+                     SourceList&               sources,
+                     framepos_t&               pos,
+                     ImportDisposition         disposition,
+                     ImportMode                mode,
+                     int                       target_regions,
+                     int                       target_tracks,
+                     boost::shared_ptr<Track>& track,
+                     bool                      /*add_channel_suffix*/,
+                     ARDOUR::PluginInfoPtr     instrument)
+{
+       vector<boost::shared_ptr<Region> > regions;
+       string region_name;
+       uint32_t input_chan = 0;
+       uint32_t output_chan = 0;
+       bool use_timestamp;
+       vector<string> track_names;
+
+       use_timestamp = (pos == -1);
+
+       // kludge (for MIDI we're abusing "channel" for "track" here)
+       if (SMFSource::safe_midi_file_extension (paths.front())) {
+               target_regions = -1;
        }
-       
-       if (check_sample_rate  && (finfo.samplerate != (int) session->frame_rate())) {
-               vector<string> choices;
-               
-               if (multiple_files) {
-                       choices.push_back (_("Cancel entire import"));
-                       choices.push_back (_("Don't embed it"));
-                       choices.push_back (_("Embed all without questions"));
-               } else {
-                       choices.push_back (_("Cancel"));
+
+       if (target_regions == 1) {
+
+               /* take all the sources we have and package them up as a region */
+
+               region_name = region_name_from_path (paths.front(), (sources.size() > 1), false);
+
+               /* we checked in import_sndfiles() that there were not too many */
+
+               while (RegionFactory::region_by_name (region_name)) {
+                       region_name = bump_name_once (region_name, '.');
                }
 
-               choices.push_back (_("Embed it anyway"));
-               
-               Gtkmm2ext::Choice rate_choice (
-                       string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
-                       choices, false);
-               
-               switch (rate_choice.run()) {
-               case 0: /* stop a multi-file import */
-               case 1: /* don't import this one */
-                       return -1;
-               case 2: /* do it, and the rest without asking */
-                       check_sample_rate = false;
-                       break;
-               case 3: /* do it */
-                       break;
-               default:
-                       return -2;
+               PropertyList plist;
+
+               plist.add (ARDOUR::Properties::start, 0);
+               plist.add (ARDOUR::Properties::length, sources[0]->length (pos));
+               plist.add (ARDOUR::Properties::name, region_name);
+               plist.add (ARDOUR::Properties::layer, 0);
+               plist.add (ARDOUR::Properties::whole_file, true);
+               plist.add (ARDOUR::Properties::external, true);
+
+               boost::shared_ptr<Region> r = RegionFactory::create (sources, plist);
+
+               if (use_timestamp && boost::dynamic_pointer_cast<AudioRegion>(r)) {
+                       boost::dynamic_pointer_cast<AudioRegion>(r)->special_set_position(sources[0]->natural_position());
+               }
+
+               regions.push_back (r);
+
+               /* if we're creating a new track, name it after the cleaned-up
+                * and "merged" region name.
+                */
+
+               track_names.push_back (region_name);
+
+       } else if (target_regions == -1 || target_regions > 1) {
+
+               /* take each source and create a region for each one */
+
+               SourceList just_one;
+               SourceList::iterator x;
+               uint32_t n;
+
+               for (n = 0, x = sources.begin(); x != sources.end(); ++x, ++n) {
+
+                       just_one.clear ();
+                       just_one.push_back (*x);
+
+                       boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource> (*x);
+
+                       if (sources.size() > 1 && disposition == ImportDistinctChannels) {
+
+                               /* generate a per-channel region name so that things work as
+                                * intended
+                                */
+
+                               string path;
+
+                               if (fs) {
+                                       region_name = basename_nosuffix (fs->path());
+                               } else {
+                                       region_name = (*x)->name();
+                               }
+
+                               if (sources.size() == 2) {
+                                       if (n == 0) {
+                                               region_name += "-L";
+                                       } else {
+                                               region_name += "-R";
+                                       }
+                               } else if (sources.size() > 2) {
+                                       region_name += string_compose ("-%1", n+1);
+                               }
+
+                               track_names.push_back (region_name);
+
+                       } else {
+                               if (fs) {
+                                       region_name = region_name_from_path (fs->path(), false, false, sources.size(), n);
+                               } else {
+                                       region_name = (*x)->name();
+                               }
+
+                               if (SMFSource::safe_midi_file_extension (paths.front())) {
+                                       string track_name = string_compose ("%1-t%2", PBD::basename_nosuffix (fs->path()), (n + 1));
+                                       track_names.push_back (track_name);
+                               } else {
+                                       track_names.push_back (PBD::basename_nosuffix (paths[n]));
+                               }
+                       }
+
+                       PropertyList plist;
+
+                       /* Fudge region length to ensure it is non-zero; make it 1 beat at 120bpm
+                          for want of a better idea.  It can't be too small, otherwise if this
+                          is a MIDI region the conversion from frames -> beats -> frames will
+                          round it back down to 0 again.
+                       */
+                       framecnt_t len = (*x)->length (pos);
+                       if (len == 0) {
+                               len = (60.0 / 120.0) * _session->frame_rate ();
+                       }
+
+                       plist.add (ARDOUR::Properties::start, 0);
+                       plist.add (ARDOUR::Properties::length, len);
+                       plist.add (ARDOUR::Properties::name, region_name);
+                       plist.add (ARDOUR::Properties::layer, 0);
+                       plist.add (ARDOUR::Properties::whole_file, true);
+                       plist.add (ARDOUR::Properties::external, true);
+
+                       boost::shared_ptr<Region> r = RegionFactory::create (just_one, plist);
+
+                       if (use_timestamp && boost::dynamic_pointer_cast<AudioRegion>(r)) {
+                               boost::dynamic_pointer_cast<AudioRegion>(r)->special_set_position((*x)->natural_position());
+                       }
+
+                       regions.push_back (r);
                }
        }
-       
-       track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
-       ARDOUR_UI::instance()->flush_pending ();
-       
-       /* make the proper number of channels in the region */
 
-       for (int n = 0; n < finfo.channels; ++n)
-       {
-               idspec = path;
-               idspec += string_compose(":%1", n);
-               
-               try {
-                       source = ExternalSource::create (idspec.c_str());
-                       sources.push_back(source);
-               } 
-               
-                catch (failed_constructor& err) {
-                        error << string_compose(_("could not open %1"), path) << endmsg;
-                        goto out;
-                }
-               
-                ARDOUR_UI::instance()->flush_pending ();
-       }
-       
-       if (sources.empty()) {
-               goto out;
-       }
-       
-       region_name = PBD::basename_nosuffix (path);
-       region_name += "-0";
-       
-       region = new AudioRegion (sources, 0, sources[0]->length(), region_name, 0,
-                                 Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External));
-       
-       input_chan = finfo.channels;
-
-       if (session->get_output_auto_connect() & Session::AutoConnectMaster) {
-               output_chan = (session->master_out() ? session->master_out()->n_inputs() : input_chan);
+       if (target_regions == 1) {
+               input_chan = regions.front()->n_channels();
+       } else {
+               if (target_tracks == 1) {
+                       input_chan = regions.size();
+               } else {
+                       input_chan = 1;
+               }
+       }
+
+       if (Config->get_output_auto_connect() & AutoConnectMaster) {
+               output_chan = (_session->master_out() ? _session->master_out()->n_inputs().n_audio() : input_chan);
        } else {
                output_chan = input_chan;
        }
-       
-       finish_bringing_in_audio (*region, input_chan, output_chan, track, pos, mode);
-       
-  out:
-       track_canvas.get_window()->set_cursor (*current_canvas_cursor);
+
+       int n = 0;
+       framepos_t rlen = 0;
+
+       begin_reversible_command (Operations::insert_file);
+
+       /* we only use tracks names when importing to new tracks, but we
+        * require that one is defined for every region, just to keep
+        * the API simpler.
+        */
+       assert (regions.size() == track_names.size());
+
+       for (vector<boost::shared_ptr<Region> >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) {
+               boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (*r);
+
+               if (use_timestamp) {
+                       if (ar) {
+
+                               /* get timestamp for this region */
+
+                               const boost::shared_ptr<Source> s (ar->sources().front());
+                               const boost::shared_ptr<AudioSource> as = boost::dynamic_pointer_cast<AudioSource> (s);
+
+                               assert (as);
+
+                               if (as->natural_position() != 0) {
+                                       pos = as->natural_position();
+                               } else if (target_tracks == 1) {
+                                       /* hmm, no timestamp available, put it after the previous region
+                                        */
+                                       if (n == 0) {
+                                               pos = get_preferred_edit_position ();
+                                       } else {
+                                               pos += rlen;
+                                       }
+                               } else {
+                                       pos = get_preferred_edit_position ();
+                               }
+                       } else {
+                               /* should really get first position in MIDI file, but for now, use edit position*/
+                               pos = get_preferred_edit_position ();
+                       }
+               }
+
+               finish_bringing_in_material (*r, input_chan, output_chan, pos, mode, track, track_names[n], instrument);
+
+               rlen = (*r)->length();
+
+               if (target_tracks != 1) {
+                       track.reset ();
+               } else {
+                       if (!use_timestamp || !ar) {
+                               /* line each one up right after the other */
+                               pos += (*r)->length();
+                       }
+               }
+       }
+
+       commit_reversible_command ();
+
+       /* setup peak file building in another thread */
+
+       for (SourceList::iterator x = sources.begin(); x != sources.end(); ++x) {
+               SourceFactory::setup_peakfile (*x, true);
+       }
+
        return 0;
 }
 
 int
- Editor::finish_bringing_in_audio (AudioRegion& region, uint32_t in_chans, uint32_t out_chans, AudioTrack* track, jack_nframes_t& pos, ImportMode mode)
- {
-        switch (mode) {
-        case ImportAsRegion:
-                /* relax, its been done */
-                break;
-               
+Editor::finish_bringing_in_material (boost::shared_ptr<Region> region,
+                                     uint32_t                  in_chans,
+                                     uint32_t                  out_chans,
+                                     framepos_t&               pos,
+                                     ImportMode                mode,
+                                     boost::shared_ptr<Track>& existing_track,
+                                     const string&             new_track_name,
+                                     ARDOUR::PluginInfoPtr     instrument)
+{
+       boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(region);
+       boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(region);
+
+       switch (mode) {
+       case ImportAsRegion:
+               /* relax, its been done */
+               break;
+
        case ImportToTrack:
-               if (track) {
-                       Playlist* playlist  = track->disk_stream().playlist();
-                       
-                       AudioRegion* copy = new AudioRegion (region);
-                       begin_reversible_command (_("insert sndfile"));
-                       session->add_undo (playlist->get_memento());
-                       playlist->add_region (*copy, pos);
-                       session->add_redo_no_execute (playlist->get_memento());
-                       commit_reversible_command ();
-
-                       pos += region.length();
+       {
+               if (!existing_track) {
+
+                       if (ar) {
+                               existing_track = get_nth_selected_audio_track (0);
+                       } else if (mr) {
+                               existing_track = get_nth_selected_midi_track (0);
+                       }
+
+                       if (!existing_track) {
+                               return -1;
+                       }
                }
+
+               boost::shared_ptr<Playlist> playlist = existing_track->playlist();
+               boost::shared_ptr<Region> copy (RegionFactory::create (region, region->properties()));
+               playlist->clear_changes ();
+               playlist->add_region (copy, pos);
+               if (Config->get_edit_mode() == Ripple)
+                       playlist->ripple (pos, copy->length(), copy);
+
+               _session->add_command (new StatefulDiffCommand (playlist));
                break;
-               
+       }
+
        case ImportAsTrack:
-               AudioTrack* at = session->new_audio_track (in_chans, out_chans);
-               AudioRegion* copy = new AudioRegion (region);
-               at->disk_stream().playlist()->add_region (*copy, pos);
+       {
+               if (!existing_track) {
+                       if (ar) {
+                               list<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (in_chans, out_chans, 0, 1, string(), PresentationInfo::max_order, Normal));
+
+                               if (at.empty()) {
+                                       return -1;
+                               }
+                               if (Config->get_strict_io ()) {
+                                       for (list<boost::shared_ptr<AudioTrack> >::iterator i = at.begin(); i != at.end(); ++i) {
+                                               (*i)->set_strict_io (true);
+                                       }
+                               }
+
+                               existing_track = at.front();
+                       } else if (mr) {
+                               list<boost::shared_ptr<MidiTrack> > mt (
+                                       _session->new_midi_track (ChanCount (DataType::MIDI, 1),
+                                                                 ChanCount (DataType::MIDI, 1),
+                                                                 Config->get_strict_io () || Profile->get_mixbus (),
+                                                                 instrument, (Plugin::PresetRecord*) 0,
+                                                                 (RouteGroup*) 0,
+                                                                 1,
+                                                                 string(),
+                                                                 PresentationInfo::max_order));
+
+                               if (mt.empty()) {
+                                       return -1;
+                               }
+
+                               // TODO set strict_io from preferences
+                               existing_track = mt.front();
+                       }
+
+                       if (!new_track_name.empty()) {
+                               existing_track->set_name (new_track_name);
+                       } else {
+                               existing_track->set_name (region->name());
+                       }
+               }
+
+               boost::shared_ptr<Playlist> playlist = existing_track->playlist();
+               boost::shared_ptr<Region> copy (RegionFactory::create (region, true));
+               playlist->clear_changes ();
+               playlist->add_region (copy, pos);
+               _session->add_command (new StatefulDiffCommand (playlist));
+               break;
+       }
+
+       case ImportAsTapeTrack:
+       {
+               if (!ar) {
+                       return -1;
+               }
+
+               list<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (in_chans, out_chans, 0, 1, string(), PresentationInfo::max_order, Destructive));
+               if (!at.empty()) {
+                       boost::shared_ptr<Playlist> playlist = at.front()->playlist();
+                       boost::shared_ptr<Region> copy (RegionFactory::create (region, true));
+                       playlist->clear_changes ();
+                       playlist->add_region (copy, pos);
+                       _session->add_command (new StatefulDiffCommand (playlist));
+               }
+               if (Config->get_strict_io ()) {
+                       for (list<boost::shared_ptr<AudioTrack> >::iterator i = at.begin(); i != at.end(); ++i) {
+                               (*i)->set_strict_io (true);
+                       }
+               }
                break;
        }
+       }
 
        return 0;
 }
@@ -340,7 +1089,7 @@ int
 void *
 Editor::_import_thread (void *arg)
 {
-       PBD::ThreadCreated (pthread_self(), X_("Import"));
+       SessionEvent::create_per_thread_pool ("import events", 64);
 
        Editor *ed = (Editor *) arg;
        return ed->import_thread ();
@@ -349,30 +1098,6 @@ Editor::_import_thread (void *arg)
 void *
 Editor::import_thread ()
 {
-       session->import_audiofile (import_status);
-       pthread_exit_pbd (0);
-       /*NOTREACHED*/
+       _session->import_files (import_status);
        return 0;
 }
-
-gint
-Editor::import_progress_timeout (void *arg)
-{
-       interthread_progress_label.set_text (import_status.doing_what);
-
-       if (import_status.freeze) {
-               interthread_cancel_button.set_sensitive(false);
-       } else {
-               interthread_cancel_button.set_sensitive(true);
-       }
-
-       if (import_status.doing_what == "building peak files") {
-               interthread_progress_bar.pulse ();
-               return FALSE;
-       } else {
-               interthread_progress_bar.set_fraction (import_status.progress);
-       }
-
-       return !(import_status.done || import_status.cancel);
-}
-