X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audio_import.cc;h=237fb6776d99d36940340b8f34e22501a55142bc;hb=167b9dda37135d6172e751ba89302bbd66ea882e;hp=da70df5c15a71c2e3ead386b9e43a85fb728f997;hpb=5399425f534e2d96d07cf29f427bfa0f39d904b7;p=ardour.git diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index da70df5c15..237fb6776d 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -46,19 +46,19 @@ #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 +80,7 @@ Editor::add_external_audio_action (ImportMode mode_hint) } if (sfbrowser == 0) { - sfbrowser = new SoundFileOmega (_("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 +110,7 @@ Editor::external_audio_dialog () if (atv) { if (atv->is_audio_track()) { audio_track_cnt++; - } + } } else { MidiTimeAxisView* mtv = dynamic_cast(*x); @@ -136,7 +136,6 @@ void Editor::session_import_dialog () { SessionImportDialog dialog (_session); - ensure_float (dialog); dialog.run (); } @@ -263,7 +262,12 @@ Editor::get_nth_selected_midi_track (int nth) const } void -Editor::do_import (vector paths, ImportDisposition disposition, 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; @@ -298,7 +302,8 @@ Editor::do_import (vector paths, ImportDisposition disposition, ImportMo ok = false; } else { ipw.show (); - ok = (import_sndfiles (paths, disposition, 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 { @@ -315,14 +320,14 @@ Editor::do_import (vector paths, ImportDisposition disposition, ImportMo 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 */ @@ -343,7 +348,8 @@ Editor::do_import (vector paths, ImportDisposition disposition, ImportMo track = get_nth_selected_audio_track (nth++); } - ok = (import_sndfiles (to_import, disposition, 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: @@ -351,7 +357,8 @@ Editor::do_import (vector paths, ImportDisposition disposition, ImportMo to_import.clear (); to_import.push_back (*a); - ok = (import_sndfiles (to_import, disposition, 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: @@ -359,7 +366,8 @@ Editor::do_import (vector paths, ImportDisposition disposition, ImportMo to_import.clear (); to_import.push_back (*a); - ok = (import_sndfiles (to_import, disposition, 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: @@ -377,7 +385,7 @@ Editor::do_import (vector paths, ImportDisposition disposition, ImportMo } void -Editor::do_embed (vector paths, ImportDisposition import_as, 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; @@ -403,7 +411,7 @@ Editor::do_embed (vector paths, ImportDisposition import_as, ImportMode track = get_nth_selected_audio_track (nth++); } - if (embed_sndfiles (to_embed, multi, check_sample_rate, import_as, 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; } } @@ -420,14 +428,14 @@ Editor::do_embed (vector paths, ImportDisposition import_as, ImportMode to_embed.clear (); to_embed.push_back (*a); - if (embed_sndfiles (to_embed, multi, check_sample_rate, import_as, 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, import_as, 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; @@ -443,7 +451,7 @@ Editor::do_embed (vector paths, ImportDisposition import_as, ImportMode to_embed.clear (); to_embed.push_back (*a); - if (embed_sndfiles (to_embed, multi, check_sample_rate, import_as, 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; } } @@ -459,8 +467,16 @@ Editor::do_embed (vector paths, ImportDisposition import_as, ImportMode } int -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) +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; @@ -476,7 +492,7 @@ Editor::import_sndfiles (vector paths, ImportDisposition disposition, Im 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() @@ -491,7 +507,10 @@ Editor::import_sndfiles (vector paths, ImportDisposition disposition, Im gtk_main_iteration (); } - import_status.done = true; + // wait for thread to terminate + while (!import_status.done) { + gtk_main_iteration (); + } int result = -1; @@ -504,7 +523,7 @@ Editor::import_sndfiles (vector paths, ImportDisposition disposition, Im import_status.mode, import_status.target_regions, import_status.target_tracks, - track, false + track, false, instrument ); /* update position from results */ @@ -512,24 +531,28 @@ Editor::import_sndfiles (vector paths, ImportDisposition disposition, Im pos = import_status.pos; } - set_canvas_cursor (current_canvas_cursor); return result; } int -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) +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; - set_canvas_cursor (_cursors->wait); - gdk_flush (); + CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait); + gdk_flush (); for (vector::iterator p = paths.begin(); p != paths.end(); ++p) { @@ -540,7 +563,7 @@ Editor::embed_sndfiles (vector 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())) { @@ -562,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")); @@ -590,19 +610,15 @@ 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 (_cursors->wait); - for (int n = 0; n < finfo.channels; ++n) { try { @@ -611,11 +627,11 @@ Editor::embed_sndfiles (vector paths, bool multifile, 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::createExternal (DataType::AUDIO, *_session, - path, n, + path, n, (mode == ImportAsTapeTrack ? Source::Destructive : Source::Flag (0)), @@ -629,35 +645,39 @@ Editor::embed_sndfiles (vector paths, bool multifile, catch (failed_constructor& err) { error << string_compose(_("could not open %1"), path) << endmsg; - goto out; + return -3; } 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, disposition, 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, ImportDisposition disposition, 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); // kludge (for MIDI we're abusing "channel" for "track" here) @@ -694,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) { @@ -715,7 +740,7 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, /* generate a per-channel region name so that things work as * intended */ - + string path; if (fs) { @@ -723,30 +748,32 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, } else { region_name = (*x)->name(); } - - switch (sources.size()) { - /* zero and one channel handled - by previous if() condition - */ - case 2: + + if (sources.size() == 2) { if (n == 0) { region_name += "-L"; } else { region_name += "-R"; } - break; - default: - region_name += (char) '-'; - region_name += (char) ('1' + n); - break; + } 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{ + } 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; @@ -798,7 +825,13 @@ Editor::add_sources (vector 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 >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) { boost::shared_ptr ar = boost::dynamic_pointer_cast (*r); @@ -831,8 +864,7 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, } } - - 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(); @@ -847,7 +879,7 @@ Editor::add_sources (vector 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) { @@ -858,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); @@ -888,6 +926,9 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t boost::shared_ptr 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; } @@ -896,27 +937,46 @@ 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 (ChanCount (DataType::MIDI, 1), - ChanCount (DataType::MIDI, 1), - boost::shared_ptr(), - 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 playlist = existing_track->playlist(); @@ -933,7 +993,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t 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 playlist = at.front()->playlist(); boost::shared_ptr copy (RegionFactory::create (region, true)); @@ -941,6 +1001,11 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t 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; } }