X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audio_import.cc;h=7f56cd9121225db90714585d0ef34412ce77dcdc;hb=91e6c1b176d93f43bab6713574c590ea97801bdc;hp=1d123b5af7e5a881db3c3e9781114c0b200d4562;hpb=eee61a9f9bf297d454e07bd2e2b9d3d1824b8272;p=ardour.git diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 1d123b5af7..7f56cd9121 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -48,6 +48,7 @@ #include "ardour/source_factory.h" #include "ardour/session.h" #include "ardour/smf_source.h" +#include "ardour/operations.h" #include "pbd/memento_command.h" #include "ardour_ui.h" @@ -60,6 +61,8 @@ #include "utils.h" #include "gui_thread.h" #include "interthread_progress_window.h" +#include "mouse_cursors.h" +#include "editor_cursors.h" #include "i18n.h" @@ -69,7 +72,7 @@ using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; using namespace Editing; -using Glib::ustring; +using std::string; /* Functions supporting the incorporation of external (non-captured) audio material into ardour */ @@ -94,7 +97,7 @@ Editor::add_external_audio_action (ImportMode mode_hint) void Editor::external_audio_dialog () { - vector paths; + vector paths; uint32_t track_cnt; if (_session == 0) { @@ -148,12 +151,15 @@ Editor::external_audio_dialog () /* lets do it */ - paths = sfbrowser->get_paths (); - + 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 (); - nframes64_t where; + framepos_t where; switch (pos) { case ImportAtEditPoint: @@ -215,19 +221,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 @@ -322,19 +325,22 @@ Editor::get_nth_selected_midi_track (int nth) const } void -Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, nframes64_t& pos) +Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, framepos_t& pos) { boost::shared_ptr track; - vector to_import; + 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; import_status.total = paths.size (); + import_status.all_done = false; ImportProgressWindow ipw (&import_status, _("Import"), _("Cancel Import")); + bool ok = true; + if (chns == Editing::ImportMergeFiles) { /* create 1 region from all paths, add to 1 track, @@ -342,7 +348,7 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mod */ bool cancel = false; - for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { + for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { int check = check_whether_and_how_to_import(*a, false); if (check == 2) { cancel = true; @@ -350,18 +356,20 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mod } } - if (!cancel) { - import_sndfiles (paths, mode, quality, pos, 1, 1, track, false); + if (cancel) { + ok = false; + } else { + ipw.show (); + ok = (import_sndfiles (paths, mode, quality, pos, 1, 1, track, false) == 0); } } else { - bool replace = false; - bool ok = true; + bool replace = false; - for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { + 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: @@ -379,62 +387,70 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mod /* NOTREACHED*/ } - /* have to reset this for every file we handle */ + /* have to reset this for every file we handle */ - if (use_timestamp) { - pos = -1; - } + if (use_timestamp) { + pos = -1; + } - switch (chns) { - case Editing::ImportDistinctFiles: + ipw.show (); - to_import.clear (); - to_import.push_back (*a); + switch (chns) { + case Editing::ImportDistinctFiles: - if (mode == Editing::ImportToTrack) { - track = get_nth_selected_audio_track (nth++); - } + 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; + ok = (import_sndfiles (to_import, mode, quality, pos, 1, -1, track, replace) == 0); + break; - case Editing::ImportDistinctChannels: + case Editing::ImportDistinctChannels: - to_import.clear (); - to_import.push_back (*a); + to_import.clear (); + to_import.push_back (*a); - ok = (import_sndfiles (to_import, mode, quality, pos, -1, -1, track, replace) == 0); - break; + ok = (import_sndfiles (to_import, mode, quality, pos, -1, -1, track, replace) == 0); + break; - case Editing::ImportSerializeFiles: + case Editing::ImportSerializeFiles: - to_import.clear (); - to_import.push_back (*a); + to_import.clear (); + to_import.push_back (*a); - ok = (import_sndfiles (to_import, mode, quality, pos, 1, 1, track, replace) == 0); - break; + 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; - } - } + 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, nframes64_t& pos) +Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode, framepos_t& pos) { boost::shared_ptr track; bool check_sample_rate = true; bool ok = false; - vector to_embed; + vector to_embed; bool multi = paths.size() > 1; int nth = 0; switch (chns) { case Editing::ImportDistinctFiles: - for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { + for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { to_embed.clear (); to_embed.push_back (*a); @@ -450,7 +466,7 @@ Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode break; case Editing::ImportDistinctChannels: - for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { + for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { to_embed.clear (); to_embed.push_back (*a); @@ -465,10 +481,10 @@ Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode if (embed_sndfiles (paths, multi, check_sample_rate, mode, pos, 1, 1, track) < -1) { goto out; } - break; + break; case Editing::ImportSerializeFiles: - for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { + for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { to_embed.clear (); to_embed.push_back (*a); @@ -489,14 +505,13 @@ Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode } int -Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality quality, nframes64_t& pos, +Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality quality, framepos_t& pos, int target_regions, int target_tracks, boost::shared_ptr& track, bool replace) { import_status.paths = paths; import_status.done = false; import_status.cancel = false; import_status.freeze = false; - import_status.done = 0.0; import_status.quality = quality; import_status.replace_existing_source = replace; @@ -506,8 +521,8 @@ Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality qual import_status.target_regions = target_regions; import_status.track = track; import_status.replace = replace; - - track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); + + set_canvas_cursor (_cursors->wait); gdk_flush (); /* start import thread for this spec. this will ultimately call Session::import_audiofiles() @@ -524,30 +539,31 @@ Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality qual import_status.done = true; + 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, + import_status.mode, + import_status.target_regions, + import_status.target_tracks, + track, false + ); /* update position from results */ pos = import_status.pos; } - - track_canvas->get_window()->set_cursor (*current_canvas_cursor); - return 0; + set_canvas_cursor (current_canvas_cursor); + return result; } int -Editor::embed_sndfiles (vector paths, bool multifile, - bool& check_sample_rate, ImportMode mode, nframes64_t& pos, int target_regions, int target_tracks, +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) { boost::shared_ptr source; @@ -555,56 +571,17 @@ Editor::embed_sndfiles (vector paths, bool multifile, string linked_path; SoundFileInfo finfo; int ret = 0; - Glib::ustring path_to_use; - track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); + set_canvas_cursor (_cursors->wait); gdk_flush (); - for (vector::iterator p = paths.begin(); p != paths.end(); ++p) { - - ustring 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 { + for (vector::iterator p = paths.begin(); p != paths.end(); ++p) { - /* 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 path = *p; + 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; @@ -668,7 +645,7 @@ Editor::embed_sndfiles (vector paths, bool multifile, } } - track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); + set_canvas_cursor (_cursors->wait); for (int n = 0; n < finfo.channels; ++n) { try { @@ -681,7 +658,7 @@ Editor::embed_sndfiles (vector paths, bool multifile, source = boost::dynamic_pointer_cast ( SourceFactory::createReadable (DataType::AUDIO, *_session, - path_to_use, n, + path, n, (mode == ImportAsTapeTrack ? Source::Destructive : Source::Flag (0)), @@ -709,16 +686,16 @@ Editor::embed_sndfiles (vector paths, bool multifile, ret = add_sources (paths, sources, pos, mode, target_regions, target_tracks, track, true); out: - track_canvas->get_window()->set_cursor (*current_canvas_cursor); + set_canvas_cursor (current_canvas_cursor); return ret; } int -Editor::add_sources (vector paths, SourceList& sources, nframes64_t& pos, ImportMode mode, +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*/) { vector > regions; - ustring region_name; + string region_name; uint32_t input_chan = 0; uint32_t output_chan = 0; bool use_timestamp; @@ -736,6 +713,12 @@ Editor::add_sources (vector paths, SourceList& sources, nframes64 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, '.'); + } + PropertyList plist; plist.add (ARDOUR::Properties::start, 0); @@ -805,55 +788,53 @@ Editor::add_sources (vector paths, SourceList& sources, nframes64 } int n = 0; - framepos_t rlen = 0; + framepos_t rlen = 0; - for (vector >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) { + for (vector >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) { + boost::shared_ptr ar = boost::dynamic_pointer_cast (*r); - boost::shared_ptr ar = boost::dynamic_pointer_cast (*r); - - if (use_timestamp && ar) { - - cerr << "Using timestamp to place region " << (*r)->name() << endl; + 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(); - cerr << "\tgot " << pos << " from source TC info\n"; - } else if (target_tracks == 1) { - /* hmm, no timestamp available, put it after the previous region - */ - if (n == 0) { - pos = get_preferred_edit_position (); - cerr << "\tno timestamp, first file, use edit pos = " << pos << endl; + /* 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; - cerr << "\tpacked-sequence-shuffle to " << pos << endl; + 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 (); - cerr << "\tmultitracks, using edit position = " << pos << endl; } - } + finish_bringing_in_material (*r, input_chan, output_chan, pos, mode, track); - rlen = (*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(); - } - } + if (target_tracks != 1) { + track.reset (); + } else { + if (!use_timestamp || !ar) { + /* line each one up right after the other */ + pos += (*r)->length(); + } + } } /* setup peak file building in another thread */ @@ -866,7 +847,7 @@ Editor::add_sources (vector paths, SourceList& sources, nframes64 } int -Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t in_chans, uint32_t out_chans, nframes64_t& pos, +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) { boost::shared_ptr ar = boost::dynamic_pointer_cast(region); @@ -894,8 +875,8 @@ 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_history (); + begin_reversible_command (Operations::insert_file); + playlist->clear_changes (); playlist->add_region (copy, pos); _session->add_command (new StatefulDiffCommand (playlist)); commit_reversible_command (); @@ -922,26 +903,37 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t existing_track = mt.front(); } - + existing_track->set_name (region->name()); } + + boost::shared_ptr playlist = existing_track->playlist(); boost::shared_ptr copy (RegionFactory::create (region)); - existing_track->playlist()->add_region (copy, pos); + begin_reversible_command (Operations::insert_file); + playlist->clear_changes (); + playlist->add_region (copy, pos); + _session->add_command (new StatefulDiffCommand (playlist)); + commit_reversible_command (); break; } case ImportAsTapeTrack: { - if (!ar) + if (!ar) { return -1; + } list > at (_session->new_audio_track (in_chans, out_chans, Destructive)); if (!at.empty()) { + boost::shared_ptr playlist = at.front()->playlist(); boost::shared_ptr copy (RegionFactory::create (region)); - at.front()->set_name (basename_nosuffix (copy->name())); - at.front()->playlist()->add_region (copy, pos); + begin_reversible_command (Operations::insert_file); + playlist->clear_changes (); + playlist->add_region (copy, pos); + _session->add_command (new StatefulDiffCommand (playlist)); + commit_reversible_command (); } break; }