X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audio_import.cc;h=3cb2d378c219dff0599a0559764f7fda4b1352ac;hb=8cd71108c1d153f84f25c3b9e5153a110826c130;hp=38355e964d19a5cbf6479351bd6f4784d9e6c76c;hpb=8b68ed57ec5c075261639435be3290c3ba8177eb;p=ardour.git diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 38355e964d..3cb2d378c2 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -33,21 +33,16 @@ #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" @@ -83,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, true, mode_hint); } else { sfbrowser->set_mode (mode_hint); } @@ -97,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.")); @@ -105,91 +101,35 @@ 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 @@ -203,7 +143,7 @@ Editor::session_import_dialog () 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" @@ -324,7 +264,7 @@ 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) { boost::shared_ptr track; vector to_import; @@ -340,7 +280,7 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode bool ok = true; - if (chns == Editing::ImportMergeFiles) { + if (disposition == Editing::ImportMergeFiles) { /* create 1 region from all paths, add to 1 track, ignore "track" @@ -359,7 +299,7 @@ Editor::do_import (vector 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) == 0); } } else { @@ -369,7 +309,7 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { const int check = check_whether_and_how_to_import (*a, true); - + switch (check) { case 2: // user said skip @@ -387,40 +327,40 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode } /* have to reset this for every file we handle */ - + if (use_timestamp) { pos = -1; } ipw.show (); - - switch (chns) { + + 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, mode, quality, pos, 1, -1, track, replace) == 0); + + ok = (import_sndfiles (to_import, disposition, 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); + + ok = (import_sndfiles (to_import, disposition, 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); + ok = (import_sndfiles (to_import, disposition, mode, quality, pos, 1, 1, track, replace) == 0); break; case Editing::ImportMergeFiles: @@ -438,7 +378,7 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode } 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) { boost::shared_ptr track; bool check_sample_rate = true; @@ -446,11 +386,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); @@ -458,7 +404,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) < -1) { goto out; } } @@ -467,17 +413,22 @@ 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) < -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) < -1) { goto out; } break; @@ -485,10 +436,15 @@ Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode, 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) < -1) { goto out; } } @@ -504,7 +460,7 @@ Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode, } int -Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality quality, framepos_t& pos, +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) { import_status.paths = paths; @@ -520,11 +476,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 (_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. */ @@ -545,6 +501,7 @@ Editor::import_sndfiles (vector 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, @@ -562,7 +519,8 @@ Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality quali int Editor::embed_sndfiles (vector paths, bool multifile, - bool& check_sample_rate, ImportMode mode, framepos_t& pos, int target_regions, int target_tracks, + bool& check_sample_rate, ImportDisposition disposition, ImportMode mode, + framepos_t& pos, int target_regions, int target_tracks, boost::shared_ptr& track) { boost::shared_ptr source; @@ -647,6 +605,7 @@ Editor::embed_sndfiles (vector paths, bool multifile, set_canvas_cursor (_cursors->wait); for (int n = 0; n < finfo.channels; ++n) { + try { /* check if we have this thing embedded already */ @@ -656,8 +615,8 @@ Editor::embed_sndfiles (vector paths, bool multifile, if ((s = _session->source_by_path_and_channel (path, n)) == 0) { source = boost::dynamic_pointer_cast ( - SourceFactory::createReadable (DataType::AUDIO, *_session, - path, n, + SourceFactory::createExternal (DataType::AUDIO, *_session, + path, n, (mode == ImportAsTapeTrack ? Source::Destructive : Source::Flag (0)), @@ -682,7 +641,8 @@ Editor::embed_sndfiles (vector paths, bool multifile, goto out; } - ret = add_sources (paths, sources, pos, mode, target_regions, target_tracks, track, true); + + ret = add_sources (paths, sources, pos, disposition, mode, target_regions, target_tracks, track, true); out: set_canvas_cursor (current_canvas_cursor); @@ -690,7 +650,7 @@ Editor::embed_sndfiles (vector paths, bool multifile, } int -Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, ImportMode mode, +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*/) { vector > regions; @@ -698,7 +658,7 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, uint32_t input_chan = 0; uint32_t output_chan = 0; bool use_timestamp; - + use_timestamp = (pos == -1); // kludge (for MIDI we're abusing "channel" for "track" here) @@ -718,8 +678,8 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, region_name = bump_name_once (region_name, '.'); } - PropertyList plist; - + PropertyList plist; + plist.add (ARDOUR::Properties::start, 0); plist.add (ARDOUR::Properties::length, sources[0]->length (pos)); plist.add (ARDOUR::Properties::name, region_name); @@ -749,12 +709,61 @@ 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(); + } + + switch (sources.size()) { + /* zero and one channel handled + by previous if() condition + */ + case 2: + if (n == 0) { + region_name += "-L"; + } else { + region_name += "-R"; + } + break; + default: + region_name += (char) '-'; + region_name += (char) ('1' + n); + break; + } + + } else { + if (fs) { + region_name = region_name_from_path (fs->path(), false, false, sources.size(), n); + } else{ + region_name = (*x)->name(); + } + } + + 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); @@ -789,41 +798,48 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, int n = 0; framepos_t rlen = 0; - for (vector >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) { + begin_reversible_command (Operations::insert_file); + + 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 (); - } else { - pos += rlen; - } - } else { - pos = get_preferred_edit_position (); - } - - } + + 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 = 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(); - + if (target_tracks != 1) { track.reset (); - } else { + } else { if (!use_timestamp || !ar) { /* line each one up right after the other */ pos += (*r)->length(); @@ -831,6 +847,8 @@ 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) { @@ -842,7 +860,7 @@ 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) + ImportMode mode, boost::shared_ptr& existing_track) { boost::shared_ptr ar = boost::dynamic_pointer_cast(region); boost::shared_ptr mr = boost::dynamic_pointer_cast(region); @@ -869,11 +887,9 @@ 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); _session->add_command (new StatefulDiffCommand (playlist)); - commit_reversible_command (); break; } @@ -889,7 +905,10 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t 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), + boost::shared_ptr(), + Normal, 0, 1)); if (mt.empty()) { return -1; @@ -897,26 +916,31 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t existing_track = mt.front(); } - + 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)); 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)); } break; } @@ -937,7 +961,7 @@ Editor::_import_thread (void *arg) void * Editor::import_thread () { - _session->import_audiofiles (import_status); + _session->import_files (import_status); pthread_exit_pbd (0); /*NOTREACHED*/ return 0;