X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audio_import.cc;h=7f56cd9121225db90714585d0ef34412ce77dcdc;hb=91e6c1b176d93f43bab6713574c590ea97801bdc;hp=506248a6c7d95283a9d7ba1f0dc5985c31888564;hpb=7ae1a99d067aa3e1510902e3e20575165cb58b5c;p=ardour.git diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 506248a6c7..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" @@ -218,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 @@ -330,7 +330,7 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode 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; @@ -359,17 +359,17 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode if (cancel) { ok = false; } else { - ipw.show (); + ipw.show (); ok = (import_sndfiles (paths, mode, quality, pos, 1, 1, track, false) == 0); } } else { - bool replace = false; + 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: @@ -387,48 +387,48 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode /* 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; + } - ipw.show (); + ipw.show (); - switch (chns) { - case Editing::ImportDistinctFiles: + switch (chns) { + case Editing::ImportDistinctFiles: - to_import.clear (); - to_import.push_back (*a); + to_import.clear (); + to_import.push_back (*a); - if (mode == Editing::ImportToTrack) { - track = get_nth_selected_audio_track (nth++); - } + 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) { @@ -481,7 +481,7 @@ 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) { @@ -508,41 +508,6 @@ 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) { - /* check for existing wholefile regions of the same name, - which can happen when we import foo.wav but end up with foo-L.wav - and foo-R.wav inside the session. this case doesn't trigger - source name collisions, so we have to catch it at the region - name level. - */ - - string region_name = region_name_from_path (paths.front(), true, false); - - if (RegionFactory::wholefile_region_by_name (region_name)) { - string message = string_compose ( _("You appear to have already imported this file, since a region called %1 already exists.\nDo you really want to import it again?"), - region_name); - MessageDialog dialog (message, false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL, true); - int ret; - - dialog.show (); - ret = dialog.run (); - dialog.hide (); - - if (ret != RESPONSE_OK) { - return -1; - } - - int l = 0; - - while (RegionFactory::region_by_name (region_name) && ++l < 999) { - region_name = bump_name_once (region_name, '.'); - } - - if (l == 999) { - error << string_compose (_("Too many regions already named something like \"%1\""), paths.front()) << endmsg; - return -1; - } - } - import_status.paths = paths; import_status.done = false; import_status.cancel = false; @@ -557,7 +522,7 @@ Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality quali import_status.track = track; import_status.replace = replace; - set_canvas_cursor (wait_cursor); + set_canvas_cursor (_cursors->wait); gdk_flush (); /* start import thread for this spec. this will ultimately call Session::import_audiofiles() @@ -607,7 +572,7 @@ Editor::embed_sndfiles (vector paths, bool multifile, SoundFileInfo finfo; int ret = 0; - set_canvas_cursor (wait_cursor); + set_canvas_cursor (_cursors->wait); gdk_flush (); for (vector::iterator p = paths.begin(); p != paths.end(); ++p) { @@ -680,7 +645,7 @@ Editor::embed_sndfiles (vector paths, bool multifile, } } - set_canvas_cursor (wait_cursor); + set_canvas_cursor (_cursors->wait); for (int n = 0; n < finfo.channels; ++n) { try { @@ -748,11 +713,11 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, region_name = region_name_from_path (paths.front(), (sources.size() > 1), false); - /* we checked in import_sndfiles() that there were not too many */ + /* 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, '.'); - } + while (RegionFactory::region_by_name (region_name)) { + region_name = bump_name_once (region_name, '.'); + } PropertyList plist; @@ -823,49 +788,53 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, } 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) { - - /* get timestamp for this region */ - - const boost::shared_ptr s (ar->sources().front()); - const boost::shared_ptr as = boost::dynamic_pointer_cast (s); + if (use_timestamp) { + if (ar) { - 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 (); + /* 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); - 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 */ @@ -906,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_changes (); + begin_reversible_command (Operations::insert_file); + playlist->clear_changes (); playlist->add_region (copy, pos); _session->add_command (new StatefulDiffCommand (playlist)); commit_reversible_command (); @@ -938,22 +907,33 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t 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; }