X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audio_import.cc;h=237fb6776d99d36940340b8f34e22501a55142bc;hb=167b9dda37135d6172e751ba89302bbd66ea882e;hp=fbf884c1623c5f37801935f305b86ac35847eef4;hpb=74c69114bc99fceff7e59c51d5bbd7b18949e8dd;p=ardour.git diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index fbf884c162..237fb6776d 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -33,35 +33,32 @@ #include -#include "ardour/session.h" -#include "ardour/session_directory.h" -#include "ardour/audioplaylist.h" -#include "ardour/audioregion.h" -#include "ardour/audio_diskstream.h" -#include "ardour/midi_track.h" -#include "ardour/midi_region.h" -#include "ardour/utils.h" #include "ardour/audio_track.h" -#include "ardour/audioplaylist.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/region_factory.h" -#include "ardour/source_factory.h" -#include "ardour/session.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 "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; @@ -81,9 +78,9 @@ Editor::add_external_audio_action (ImportMode mode_hint) msg.run (); return; } - + 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); } @@ -95,7 +92,8 @@ void Editor::external_audio_dialog () { vector paths; - uint32_t track_cnt; + 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.")); @@ -103,105 +101,48 @@ Editor::external_audio_dialog () return; } - track_cnt = 0; + audio_track_cnt = 0; + midi_track_cnt = 0; for (TrackSelection::iterator x = selection->tracks.begin(); x != selection->tracks.end(); ++x) { AudioTimeAxisView* atv = dynamic_cast(*x); - if (!atv) { - continue; - } else if (atv->is_audio_track()) { - track_cnt++; + if (atv) { + if (atv->is_audio_track()) { + audio_track_cnt++; + } + + } else { + MidiTimeAxisView* mtv = dynamic_cast(*x); + + if (mtv) { + if (mtv->is_midi_track()) { + midi_track_cnt++; + } + } } } if (sfbrowser == 0) { - sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), _session, track_cnt, true); + sfbrowser = new SoundFileOmega (_("Add Existing Media"), _session, audio_track_cnt, midi_track_cnt, true); } else { - sfbrowser->reset (track_cnt); + 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 upaths = sfbrowser->get_paths (); - for (vector::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 (); } typedef std::map > SourceMap; /** - * Updating is still disabled, see note in libs/ardour/import.cc Session::import_audiofiles() + * Updating is still disabled, see note in libs/ardour/import.cc Session::import_files() * * all_or_nothing: * true = show "Update", "Import" and "Skip" @@ -217,20 +158,16 @@ 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 wave_name_exists = false; + bool already_exists = false; + uint32_t existing; - for (SourceMap::iterator i = all_sources.begin(); i != all_sources.end(); ++i) { - string tmp (Glib::path_get_basename (i->second->path())); - if (tmp == wave_name) { - wave_name_exists = true; - break; - } + if ((existing = _session->count_sources_by_origin (path)) > 0) { + already_exists = true; } int function = 1; - if (wave_name_exists) { + if (already_exists) { string message; if (all_or_nothing) { // updating is still disabled @@ -325,12 +262,17 @@ Editor::get_nth_selected_midi_track (int nth) const } void -Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, framepos_t& pos) +Editor::do_import (vector paths, + ImportDisposition disposition, + ImportMode mode, + SrcQuality quality, + framepos_t& pos, + ARDOUR::PluginInfoPtr instrument) { boost::shared_ptr track; vector to_import; int nth = 0; - bool use_timestamp = (pos == -1); + bool use_timestamp = (pos == -1); current_interthread_info = &import_status; import_status.current = 1; @@ -339,7 +281,9 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode ImportProgressWindow ipw (&import_status, _("Import"), _("Cancel Import")); - if (chns == Editing::ImportMergeFiles) { + bool ok = true; + + if (disposition == Editing::ImportMergeFiles) { /* create 1 region from all paths, add to 1 track, ignore "track" @@ -354,82 +298,94 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode } } - if (!cancel) { - import_sndfiles (paths, mode, quality, pos, 1, 1, track, false); + 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; - bool ok = true; + bool replace = false; for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { - const int check = check_whether_and_how_to_import (*a, true); - + 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; - /* 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 */ - - if (use_timestamp) { - pos = -1; - } + /* have to reset this for every file we handle */ - switch (chns) { - 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, mode, quality, pos, 1, -1, track, replace) == 0); - break; - - case Editing::ImportDistinctChannels: - - to_import.clear (); - to_import.push_back (*a); - - ok = (import_sndfiles (to_import, mode, quality, pos, -1, -1, track, replace) == 0); - break; - - case Editing::ImportSerializeFiles: - - to_import.clear (); - to_import.push_back (*a); - - ok = (import_sndfiles (to_import, mode, quality, pos, 1, 1, track, replace) == 0); - break; - - case Editing::ImportMergeFiles: - // Not entered, handled in earlier if() branch - break; - } - } + 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; + } + } + } + + if (ok) { + _session->save_state (""); } import_status.all_done = true; } void -Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode, framepos_t& pos) +Editor::do_embed (vector paths, ImportDisposition import_as, ImportMode mode, framepos_t& pos, ARDOUR::PluginInfoPtr instrument) { boost::shared_ptr track; bool check_sample_rate = true; @@ -437,11 +393,17 @@ Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode, vector to_embed; bool multi = paths.size() > 1; int nth = 0; + bool use_timestamp = (pos == -1); - switch (chns) { + switch (import_as) { case Editing::ImportDistinctFiles: for (vector::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); @@ -449,7 +411,7 @@ Editor::do_embed (vector 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; } } @@ -458,28 +420,38 @@ Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode, case Editing::ImportDistinctChannels: for (vector::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, 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; + break; case Editing::ImportSerializeFiles: for (vector::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, 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; } } @@ -495,8 +467,16 @@ Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode, } int -Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality quality, framepos_t& pos, - int target_regions, int target_tracks, boost::shared_ptr& track, bool replace) +Editor::import_sndfiles (vector paths, + ImportDisposition disposition, + ImportMode mode, + SrcQuality quality, + framepos_t& pos, + int target_regions, + int target_tracks, + boost::shared_ptr& track, + bool replace, + ARDOUR::PluginInfoPtr instrument) { import_status.paths = paths; import_status.done = false; @@ -511,11 +491,11 @@ Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality quali import_status.target_regions = target_regions; import_status.track = track; import_status.replace = replace; - - set_canvas_cursor (wait_cursor); + + CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait); gdk_flush (); - /* start import thread for this spec. this will ultimately call Session::import_audiofiles() + /* 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. */ @@ -527,92 +507,63 @@ Editor::import_sndfiles (vector 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; if (!import_status.cancel && !import_status.sources.empty()) { - if (add_sources (import_status.paths, - import_status.sources, - import_status.pos, - import_status.mode, - import_status.target_regions, - import_status.target_tracks, - track, false) == 0) { - _session->save_state (""); - } + 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; } - - set_canvas_cursor (current_canvas_cursor); - return 0; + return result; } int -Editor::embed_sndfiles (vector paths, bool multifile, - bool& check_sample_rate, ImportMode mode, framepos_t& pos, int target_regions, int target_tracks, - boost::shared_ptr& track) +Editor::embed_sndfiles (vector paths, + bool multifile, + bool& check_sample_rate, + ImportDisposition disposition, + ImportMode mode, + framepos_t& pos, + int target_regions, + int target_tracks, + boost::shared_ptr& track, + ARDOUR::PluginInfoPtr instrument) { boost::shared_ptr source; SourceList sources; string linked_path; SoundFileInfo finfo; - int ret = 0; - string path_to_use; - set_canvas_cursor (wait_cursor); - gdk_flush (); + CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait); + gdk_flush (); for (vector::iterator p = paths.begin(); p != paths.end(); ++p) { string path = *p; - - if (Config->get_try_link_for_embed()) { - - /* lets see if we can link it into the session */ - - sys::path tmp = _session->session_directory().sound_path() / Glib::path_get_basename(path); - linked_path = tmp.to_string(); - - path_to_use = linked_path; - - if (link (path.c_str(), linked_path.c_str()) == 0) { - - /* 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. - */ - - path = linked_path; - path_to_use = Glib::path_get_basename (path); - - } else { - - /* one possible reason is that its already linked */ - - if (errno == EEXIST) { - struct stat sb; - - if (stat (linked_path.c_str(), &sb) == 0) { - if (sb.st_nlink > 1) { // its a hard link, assume its the one we want - path = linked_path; - path_to_use = Glib::path_get_basename (path); - } - } - } - } - } + string error_msg; /* note that we temporarily truncated _id at the colon */ - string error_msg; - 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())) { @@ -634,19 +585,16 @@ Editor::embed_sndfiles (vector 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")); @@ -662,31 +610,28 @@ Editor::embed_sndfiles (vector 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 (wait_cursor); - for (int n = 0; n < finfo.channels; ++n) { + try { /* check if we have this thing embedded already */ boost::shared_ptr 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 ( - SourceFactory::createReadable (DataType::AUDIO, *_session, - path_to_use, n, + SourceFactory::createExternal (DataType::AUDIO, *_session, + path, n, (mode == ImportAsTapeTrack ? Source::Destructive : Source::Flag (0)), @@ -700,33 +645,38 @@ Editor::embed_sndfiles (vector 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 paths, SourceList& sources, framepos_t& pos, ImportMode mode, - int target_regions, int target_tracks, boost::shared_ptr& track, bool /*add_channel_suffix*/) +Editor::add_sources (vector paths, + SourceList& sources, + framepos_t& pos, + ImportDisposition disposition, + ImportMode mode, + int target_regions, + int target_tracks, + boost::shared_ptr& track, + bool /*add_channel_suffix*/, + ARDOUR::PluginInfoPtr instrument) { vector > regions; string region_name; uint32_t input_chan = 0; uint32_t output_chan = 0; bool use_timestamp; + vector track_names; use_timestamp = (pos == -1); @@ -741,8 +691,14 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, region_name = region_name_from_path (paths.front(), (sources.size() > 1), false); - PropertyList plist; - + /* 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, '.'); + } + + PropertyList plist; + plist.add (ARDOUR::Properties::start, 0); plist.add (ARDOUR::Properties::length, sources[0]->length (pos)); plist.add (ARDOUR::Properties::name, region_name); @@ -758,6 +714,11 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, 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) { @@ -772,12 +733,63 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, just_one.clear (); just_one.push_back (*x); - region_name = region_name_from_path ((*x)->path(), false, false, sources.size(), n); + boost::shared_ptr fs = boost::dynamic_pointer_cast (*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 (); + } - PropertyList plist; - plist.add (ARDOUR::Properties::start, 0); - plist.add (ARDOUR::Properties::length, (*x)->length (pos)); + 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); @@ -810,51 +822,64 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, } int n = 0; - framepos_t rlen = 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 >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) { - - boost::shared_ptr ar = boost::dynamic_pointer_cast (*r); - - if (use_timestamp && ar) { - - /* get timestamp for this region */ - - const boost::shared_ptr s (ar->sources().front()); - const boost::shared_ptr as = boost::dynamic_pointer_cast (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 (); + boost::shared_ptr ar = boost::dynamic_pointer_cast (*r); + + if (use_timestamp) { + if (ar) { + + /* get timestamp for this region */ + + const boost::shared_ptr s (ar->sources().front()); + const boost::shared_ptr as = boost::dynamic_pointer_cast (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 += rlen; + 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(); - - if (target_tracks != 1) { - track.reset (); - } else { - if (!use_timestamp || !ar) { - /* line each one up right after the other */ - pos += (*r)->length(); - } - } + 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) { @@ -865,8 +890,14 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, } int -Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t in_chans, uint32_t out_chans, framepos_t& pos, - ImportMode mode, boost::shared_ptr& existing_track) +Editor::finish_bringing_in_material (boost::shared_ptr region, + uint32_t in_chans, + uint32_t out_chans, + framepos_t& pos, + ImportMode mode, + boost::shared_ptr& existing_track, + const string& new_track_name, + ARDOUR::PluginInfoPtr instrument) { boost::shared_ptr ar = boost::dynamic_pointer_cast(region); boost::shared_ptr mr = boost::dynamic_pointer_cast(region); @@ -893,11 +924,12 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t boost::shared_ptr playlist = existing_track->playlist(); boost::shared_ptr copy (RegionFactory::create (region, region->properties())); - begin_reversible_command (_("insert file")); - playlist->clear_changes (); + 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)); - commit_reversible_command (); break; } @@ -905,42 +937,74 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t { if (!existing_track) { if (ar) { - list > at (_session->new_audio_track (in_chans, out_chans, Normal, 0, 1)); + list > 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 >::iterator i = at.begin(); i != at.end(); ++i) { + (*i)->set_strict_io (true); + } + } existing_track = at.front(); } else if (mr) { - list > mt (_session->new_midi_track (Normal, 0, 1)); + list > mt ( + _session->new_midi_track (ChanCount (DataType::MIDI, 1), + ChanCount (DataType::MIDI, 1), + instrument, (Plugin::PresetRecord*) 0, + (RouteGroup*) 0, + 1, + string(), + PresentationInfo::max_order)); if (mt.empty()) { return -1; } + if (Config->get_strict_io ()) { + for (list >::iterator i = mt.begin(); i != mt.end(); ++i) { + (*i)->set_strict_io (true); + } + } + // 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 copy (RegionFactory::create (region)); - existing_track->playlist()->add_region (copy, pos); + boost::shared_ptr playlist = existing_track->playlist(); + boost::shared_ptr copy (RegionFactory::create (region, true)); + playlist->clear_changes (); + playlist->add_region (copy, pos); + _session->add_command (new StatefulDiffCommand (playlist)); break; } - case ImportAsTapeTrack: { - if (!ar) + if (!ar) { return -1; + } - list > at (_session->new_audio_track (in_chans, out_chans, Destructive)); + list > at (_session->new_audio_track (in_chans, out_chans, 0, 1, string(), PresentationInfo::max_order, Destructive)); if (!at.empty()) { - boost::shared_ptr copy (RegionFactory::create (region)); - at.front()->set_name (basename_nosuffix (copy->name())); - at.front()->playlist()->add_region (copy, pos); + boost::shared_ptr playlist = at.front()->playlist(); + boost::shared_ptr 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 >::iterator i = at.begin(); i != at.end(); ++i) { + (*i)->set_strict_io (true); + } } break; } @@ -961,8 +1025,6 @@ Editor::_import_thread (void *arg) void * Editor::import_thread () { - _session->import_audiofiles (import_status); - pthread_exit_pbd (0); - /*NOTREACHED*/ + _session->import_files (import_status); return 0; }