Add a PianoKeyboard to GenericUI (on a MIDI track)
[ardour.git] / gtk2_ardour / editor_audio_import.cc
index a19084e69da8b68ebd73e368497d3da1c0e6db9a..0ee0810ff29f855885463f5b3d396c25b5fc4fc8 100644 (file)
@@ -31,7 +31,7 @@
 #include "pbd/shortpath.h"
 #include "pbd/stateful_diff_command.h"
 
-#include <gtkmm2ext/choice.h>
+#include "widgets/choice.h"
 
 #include "ardour/audio_track.h"
 #include "ardour/audiofilesource.h"
@@ -39,6 +39,7 @@
 #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 "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 "utils.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;
@@ -80,7 +81,7 @@ Editor::add_external_audio_action (ImportMode mode_hint)
        }
 
        if (sfbrowser == 0) {
-               sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), _session, 0, true, mode_hint);
+               sfbrowser = new SoundFileOmega (_("Add Existing Media"), _session, 0, 0, true, mode_hint);
        } else {
                sfbrowser->set_mode (mode_hint);
        }
@@ -110,7 +111,7 @@ Editor::external_audio_dialog ()
                if (atv) {
                        if (atv->is_audio_track()) {
                                audio_track_cnt++;
-                       } 
+                       }
 
                } else {
                        MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*>(*x);
@@ -124,85 +125,18 @@ Editor::external_audio_dialog ()
        }
 
        if (sfbrowser == 0) {
-               sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), _session, audio_track_cnt, midi_track_cnt, true);
+               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 ();
-
-
-       bool keepRunning;
-
-       do {
-               keepRunning = false;
-
-               int response = sfbrowser->run ();
-
-               switch (response) {
-                       case RESPONSE_APPLY:
-                               // leave the dialog open
-                               break;
-
-                       case RESPONSE_OK:
-                               sfbrowser->hide ();
-                               break;
-
-                       default:
-                               // cancel from the browser - we are done
-                               sfbrowser->hide ();
-                               return;
-               }
-
-               /* lets do it */
-
-               vector<string> upaths = sfbrowser->get_paths ();
-                for (vector<string>::iterator x = upaths.begin(); x != upaths.end(); ++x) {
-                        paths.push_back (*x);
-                }
-
-               ImportPosition pos = sfbrowser->get_position ();
-               ImportMode mode = sfbrowser->get_mode ();
-               ImportDisposition chns = sfbrowser->get_channel_disposition ();
-               framepos_t where;
-
-               switch (pos) {
-                       case ImportAtEditPoint:
-                               where = get_preferred_edit_position ();
-                               break;
-                       case ImportAtTimestamp:
-                               where = -1;
-                               break;
-                       case ImportAtPlayhead:
-                               where = playhead_cursor->current_frame;
-                               break;
-                       case ImportAtStart:
-                               where = _session->current_start_frame();
-                               break;
-               }
-
-               SrcQuality quality = sfbrowser->get_src_quality();
-
-
-               if (sfbrowser->copy_files_btn.get_active()) {
-                       do_import (paths, chns, mode, quality, where);
-               } else {
-                       do_embed (paths, chns, mode, where);
-               }
-
-               if (response == RESPONSE_APPLY) {
-                       sfbrowser->clear_selection ();
-                       keepRunning = true;
-               }
-
-       } while (keepRunning);
 }
 
 void
 Editor::session_import_dialog ()
 {
        SessionImportDialog dialog (_session);
-       ensure_float (dialog);
        dialog.run ();
 }
 
@@ -225,7 +159,6 @@ Editor::check_whether_and_how_to_import(string path, bool all_or_nothing)
 {
        string wave_name (Glib::path_get_basename(path));
 
-       SourceMap all_sources = _session->get_sources();
        bool already_exists = false;
        uint32_t existing;
 
@@ -330,23 +263,103 @@ Editor::get_nth_selected_midi_track (int nth) const
 }
 
 void
-Editor::do_import (vector<string> paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, framepos_t& pos)
+Editor::import_smf_tempo_map (Evoral::SMF const & smf, framepos_t pos)
+{
+       if (!_session) {
+               return;
+       }
+
+       const size_t num_tempos = smf.num_tempos ();
+
+       if (num_tempos == 0) {
+               return;
+       }
+
+       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<string>        paths,
+                   ImportDisposition     disposition,
+                   ImportMode            mode,
+                   SrcQuality            quality,
+                   MidiTrackNameSource   midi_track_name_source,
+                   MidiTempoMapDisposition smf_tempo_disposition,
+                   framepos_t&           pos,
+                   ARDOUR::PluginInfoPtr instrument)
 {
        boost::shared_ptr<Track> track;
        vector<string> to_import;
        int nth = 0;
        bool use_timestamp = (pos == -1);
 
+       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 (chns == Editing::ImportMergeFiles) {
+       if (disposition == Editing::ImportMergeFiles) {
 
                /* create 1 region from all paths, add to 1 track,
                   ignore "track"
@@ -365,7 +378,8 @@ Editor::do_import (vector<string> paths, ImportDisposition chns, ImportMode mode
                        ok = false;
                } else {
                        ipw.show ();
-                       ok = (import_sndfiles (paths, mode, quality, pos, 1, 1, track, false) == 0);
+                       ok = (import_sndfiles (paths, disposition, mode, quality, pos, 1, 1, track, false, instrument) == 0);
+                       import_status.sources.clear();
                }
 
        } else {
@@ -382,14 +396,14 @@ Editor::do_import (vector<string> paths, ImportDisposition chns, ImportMode mode
                                continue;
                        case 0:
                                fatal << "Updating existing sources should be disabled!" << endmsg;
-                               /* NOTREACHED*/
+                               abort(); /* NOTREACHED*/
                                break;
                        case 1:
                                replace = false;
                                break;
                        default:
                                fatal << "Illegal return " << check <<  " from check_whether_and_how_to_import()!" << endmsg;
-                               /* NOTREACHED*/
+                               abort(); /* NOTREACHED*/
                        }
 
                        /* have to reset this for every file we handle */
@@ -400,7 +414,7 @@ Editor::do_import (vector<string> paths, ImportDisposition chns, ImportMode mode
 
                        ipw.show ();
 
-                       switch (chns) {
+                       switch (disposition) {
                        case Editing::ImportDistinctFiles:
 
                                to_import.clear ();
@@ -410,7 +424,8 @@ Editor::do_import (vector<string> paths, ImportDisposition chns, ImportMode mode
                                        track = get_nth_selected_audio_track (nth++);
                                }
 
-                               ok = (import_sndfiles (to_import, mode, quality, pos, 1, -1, track, replace) == 0);
+                               ok = (import_sndfiles (to_import, disposition, mode, quality, pos, 1, -1, track, replace, instrument) == 0);
+                               import_status.sources.clear();
                                break;
 
                        case Editing::ImportDistinctChannels:
@@ -418,7 +433,8 @@ Editor::do_import (vector<string> paths, ImportDisposition chns, ImportMode mode
                                to_import.clear ();
                                to_import.push_back (*a);
 
-                               ok = (import_sndfiles (to_import, mode, quality, pos, -1, -1, track, replace) == 0);
+                               ok = (import_sndfiles (to_import, disposition, mode, quality, pos, -1, -1, track, replace, instrument) == 0);
+                               import_status.sources.clear();
                                break;
 
                        case Editing::ImportSerializeFiles:
@@ -426,7 +442,8 @@ Editor::do_import (vector<string> paths, ImportDisposition chns, ImportMode mode
                                to_import.clear ();
                                to_import.push_back (*a);
 
-                               ok = (import_sndfiles (to_import, mode, quality, pos, 1, 1, track, replace) == 0);
+                               ok = (import_sndfiles (to_import, disposition, mode, quality, pos, 1, 1, track, replace, instrument) == 0);
+                               import_status.sources.clear();
                                break;
 
                        case Editing::ImportMergeFiles:
@@ -444,7 +461,7 @@ Editor::do_import (vector<string> paths, ImportDisposition chns, ImportMode mode
 }
 
 void
-Editor::do_embed (vector<string> paths, ImportDisposition chns, ImportMode mode, framepos_t& pos)
+Editor::do_embed (vector<string> paths, ImportDisposition import_as, ImportMode mode, framepos_t& pos, ARDOUR::PluginInfoPtr instrument)
 {
        boost::shared_ptr<Track> track;
        bool check_sample_rate = true;
@@ -454,7 +471,7 @@ Editor::do_embed (vector<string> paths, ImportDisposition chns, ImportMode mode,
        int nth = 0;
        bool use_timestamp = (pos == -1);
 
-       switch (chns) {
+       switch (import_as) {
        case Editing::ImportDistinctFiles:
                for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) {
 
@@ -470,7 +487,7 @@ Editor::do_embed (vector<string> paths, ImportDisposition chns, ImportMode mode,
                                track = get_nth_selected_audio_track (nth++);
                        }
 
-                       if (embed_sndfiles (to_embed, multi, check_sample_rate, mode, pos, 1, -1, track) < -1) {
+                       if (embed_sndfiles (to_embed, multi, check_sample_rate, import_as, mode, pos, 1, -1, track, instrument) < -1) {
                                goto out;
                        }
                }
@@ -487,14 +504,14 @@ Editor::do_embed (vector<string> paths, ImportDisposition chns, ImportMode mode,
                        to_embed.clear ();
                        to_embed.push_back (*a);
 
-                       if (embed_sndfiles (to_embed, multi, check_sample_rate, mode, pos, -1, -1, track) < -1) {
+                       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, mode, pos, 1, 1, track) < -1) {
+               if (embed_sndfiles (paths, multi, check_sample_rate, import_as, mode, pos, 1, 1, track, instrument) < -1) {
                        goto out;
                }
                break;
@@ -510,7 +527,7 @@ Editor::do_embed (vector<string> paths, ImportDisposition chns, ImportMode mode,
                        to_embed.clear ();
                        to_embed.push_back (*a);
 
-                       if (embed_sndfiles (to_embed, multi, check_sample_rate, mode, pos, 1, 1, track) < -1) {
+                       if (embed_sndfiles (to_embed, multi, check_sample_rate, import_as, mode, pos, 1, 1, track, instrument) < -1) {
                                goto out;
                        }
                }
@@ -526,8 +543,16 @@ Editor::do_embed (vector<string> paths, ImportDisposition chns, ImportMode mode,
 }
 
 int
-Editor::import_sndfiles (vector<string> paths, ImportMode mode, SrcQuality quality, framepos_t& pos,
-                        int target_regions, int target_tracks, boost::shared_ptr<Track>& track, bool replace)
+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)
 {
        import_status.paths = paths;
        import_status.done = false;
@@ -535,6 +560,7 @@ Editor::import_sndfiles (vector<string> paths, ImportMode mode, SrcQuality quali
        import_status.freeze = false;
        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;
@@ -543,7 +569,7 @@ Editor::import_sndfiles (vector<string> paths, ImportMode mode, SrcQuality quali
        import_status.track = track;
        import_status.replace = replace;
 
-       set_canvas_cursor (_cursors->wait);
+       CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
        gdk_flush ();
 
        /* start import thread for this spec. this will ultimately call Session::import_files()
@@ -558,7 +584,10 @@ Editor::import_sndfiles (vector<string> paths, ImportMode mode, SrcQuality quali
                gtk_main_iteration ();
        }
 
-       import_status.done = true;
+       // wait for thread to terminate
+       while (!import_status.done) {
+               gtk_main_iteration ();
+       }
 
        int result = -1;
 
@@ -567,10 +596,11 @@ Editor::import_sndfiles (vector<string> paths, ImportMode mode, SrcQuality quali
                        import_status.paths,
                        import_status.sources,
                        import_status.pos,
+                       disposition,
                        import_status.mode,
                        import_status.target_regions,
                        import_status.target_tracks,
-                       track, false
+                       track, false, instrument
                        );
 
                /* update position from results */
@@ -578,22 +608,27 @@ Editor::import_sndfiles (vector<string> paths, ImportMode mode, SrcQuality quali
                pos = import_status.pos;
        }
 
-       set_canvas_cursor (current_canvas_cursor);
        return result;
 }
 
 int
-Editor::embed_sndfiles (vector<string> paths, bool multifile,
-                       bool& check_sample_rate, ImportMode mode, framepos_t& pos, int target_regions, int target_tracks,
-                       boost::shared_ptr<Track>& track)
+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)
 {
        boost::shared_ptr<AudioFileSource> source;
        SourceList sources;
        string linked_path;
        SoundFileInfo finfo;
-       int ret = 0;
 
-       set_canvas_cursor (_cursors->wait);
+       CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
        gdk_flush ();
 
        for (vector<string>::iterator p = paths.begin(); p != paths.end(); ++p) {
@@ -605,7 +640,7 @@ Editor::embed_sndfiles (vector<string> paths, bool multifile,
 
                if (!AudioFileSource::get_soundfile_info (path, finfo, error_msg)) {
                        error << string_compose(_("Editor: cannot open file \"%1\", (%2)"), path, error_msg ) << endmsg;
-                       goto out;
+                       return -3;
                }
 
                if (check_sample_rate  && (finfo.samplerate != (int) _session->frame_rate())) {
@@ -616,7 +651,7 @@ Editor::embed_sndfiles (vector<string> paths, bool multifile,
                                choices.push_back (_("Don't embed it"));
                                choices.push_back (_("Embed all without questions"));
 
-                               Gtkmm2ext::Choice rate_choice (
+                               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)),
@@ -627,25 +662,22 @@ Editor::embed_sndfiles (vector<string> paths, bool multifile,
 
                                switch (resx) {
                                case 0: /* stop a multi-file import */
-                                       ret = -2;
-                                       goto out;
+                                       return -2;
                                case 1: /* don't embed this one */
-                                       ret = -1;
-                                       goto out;
+                                       return -1;
                                case 2: /* do it, and the rest without asking */
                                        check_sample_rate = false;
                                        break;
                                case 3: /* do it */
                                        break;
                                default:
-                                       ret = -2;
-                                       goto out;
+                                       return -2;
                                }
                        } else {
                                choices.push_back (_("Cancel"));
                                choices.push_back (_("Embed it anyway"));
 
-                               Gtkmm2ext::Choice rate_choice (
+                               ArdourWidgets::Choice rate_choice (
                                        _("Sample rate"),
                                        string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
                                        choices, false
@@ -655,30 +687,27 @@ Editor::embed_sndfiles (vector<string> paths, bool multifile,
 
                                switch (resx) {
                                case 0: /* don't import */
-                                       ret = -1;
-                                       goto out;
+                                       return -1;
                                case 1: /* do it */
                                        break;
                                default:
-                                       ret = -2;
-                                       goto out;
+                                       return -2;
                                }
                        }
                }
 
-               set_canvas_cursor (_cursors->wait);
-
                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->source_by_path_and_channel (path, n)) == 0) {
+                               if ((s = _session->audio_source_by_path_and_channel (path, n)) == 0) {
 
                                        source = boost::dynamic_pointer_cast<AudioFileSource> (
-                                               SourceFactory::createReadable (DataType::AUDIO, *_session,
+                                               SourceFactory::createExternal (DataType::AUDIO, *_session,
                                                                               path, n,
                                                                               (mode == ImportAsTapeTrack
                                                                                ? Source::Destructive
@@ -693,33 +722,38 @@ Editor::embed_sndfiles (vector<string> paths, bool multifile,
 
                        catch (failed_constructor& err) {
                                error << string_compose(_("could not open %1"), path) << endmsg;
-                               goto out;
+                               return -3;
                        }
 
-                       ARDOUR_UI::instance()->flush_pending ();
+                       gtk_main_iteration();
                }
        }
 
-       if (sources.empty()) {
-               goto out;
+       if (!sources.empty()) {
+               return add_sources (paths, sources, pos, disposition, mode, target_regions, target_tracks, track, true, instrument);
        }
 
-       ret = add_sources (paths, sources, pos, mode, target_regions, target_tracks, track, true);
-
-  out:
-       set_canvas_cursor (current_canvas_cursor);
-       return ret;
+       return 0;
 }
 
 int
-Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos, ImportMode mode,
-                    int target_regions, int target_tracks, boost::shared_ptr<Track>& track, bool /*add_channel_suffix*/)
+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);
 
@@ -753,10 +787,15 @@ Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos,
 
                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) {
 
@@ -773,10 +812,45 @@ Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos,
 
                        boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource> (*x);
 
-                       if (fs) {
-                               region_name = region_name_from_path (fs->path(), false, false, sources.size(), n);
-                       } else{
-                               region_name = (*x)->name();
+                       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;
@@ -828,41 +902,46 @@ Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos,
        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 */
+                       if (ar) {
 
-                                const boost::shared_ptr<Source> s (ar->sources().front());
-                                const boost::shared_ptr<AudioSource> as = boost::dynamic_pointer_cast<AudioSource> (s);
+                               /* get timestamp for this region */
 
-                                assert (as);
+                               const boost::shared_ptr<Source> s (ar->sources().front());
+                               const boost::shared_ptr<AudioSource> as = boost::dynamic_pointer_cast<AudioSource> (s);
 
-                                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 ();
-                        }
-                }
+                               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);
+               finish_bringing_in_material (*r, input_chan, output_chan, pos, mode, track, track_names[n], instrument);
 
                rlen = (*r)->length();
 
@@ -877,7 +956,7 @@ Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos,
        }
 
        commit_reversible_command ();
-       
+
        /* setup peak file building in another thread */
 
        for (SourceList::iterator x = sources.begin(); x != sources.end(); ++x) {
@@ -888,8 +967,14 @@ Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos,
 }
 
 int
-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)
+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);
@@ -918,6 +1003,9 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t
                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;
        }
@@ -926,27 +1014,42 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t
        {
                if (!existing_track) {
                        if (ar) {
-                               list<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (in_chans, out_chans, Normal, 0, 1));
+                               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),
-                                                                                                 boost::shared_ptr<PluginInfo>(), 
-                                                                                                 Normal, 0, 1));
+                               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();
                        }
 
-                       existing_track->set_name (region->name());
+                       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();
@@ -963,7 +1066,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t
                        return -1;
                }
 
-               list<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (in_chans, out_chans, Destructive));
+               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));
@@ -971,6 +1074,11 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t
                        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;
        }
        }
@@ -991,7 +1099,5 @@ void *
 Editor::import_thread ()
 {
        _session->import_files (import_status);
-       pthread_exit_pbd (0);
-       /*NOTREACHED*/
        return 0;
 }