X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audio_import.cc;h=e5ac8c6c725231b2666186f1742e9020e7d6d0aa;hb=f77f54a6e29feea04d5aa15969e73df84e020875;hp=6200a6f98ff42f6fbb0b8f3dce3fe72345535057;hpb=8fb9e72a77ac1366ed1aca18f7f76ee4179d9f89;p=ardour.git diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 6200a6f98f..e5ac8c6c72 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -33,22 +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/operations.h" +#include "ardour/source_factory.h" +#include "ardour/utils.h" #include "pbd/memento_command.h" #include "ardour_ui.h" @@ -58,7 +52,6 @@ #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" @@ -86,7 +79,7 @@ Editor::add_external_audio_action (ImportMode mode_hint) } 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); } @@ -130,78 +123,12 @@ Editor::external_audio_dialog () } if (sfbrowser == 0) { - sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), _session, audio_track_cnt, midi_track_cnt, true); + sfbrowser = new SoundFileOmega (_("Add Existing Media"), _session, audio_track_cnt, midi_track_cnt, true); } else { 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 @@ -215,7 +142,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" @@ -231,7 +158,6 @@ 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 already_exists = false; uint32_t existing; @@ -336,7 +262,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; @@ -352,7 +278,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" @@ -371,7 +297,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 { @@ -406,7 +332,7 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode ipw.show (); - switch (chns) { + switch (disposition) { case Editing::ImportDistinctFiles: to_import.clear (); @@ -416,7 +342,7 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode 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: @@ -424,7 +350,7 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode 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: @@ -432,7 +358,7 @@ Editor::do_import (vector paths, ImportDisposition chns, ImportMode mode 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: @@ -450,7 +376,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; @@ -460,7 +386,7 @@ Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode, 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) { @@ -476,7 +402,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; } } @@ -493,14 +419,14 @@ Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode, 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; @@ -516,7 +442,7 @@ Editor::do_embed (vector paths, ImportDisposition chns, ImportMode mode, 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; } } @@ -532,7 +458,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; @@ -552,7 +478,7 @@ Editor::import_sndfiles (vector paths, ImportMode mode, SrcQuality quali 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. */ @@ -573,6 +499,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, @@ -590,7 +517,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; @@ -599,8 +527,8 @@ Editor::embed_sndfiles (vector paths, bool multifile, SoundFileInfo finfo; int ret = 0; - set_canvas_cursor (_cursors->wait); - gdk_flush (); + push_canvas_cursor (_cursors->wait); + gdk_flush (); for (vector::iterator p = paths.begin(); p != paths.end(); ++p) { @@ -672,20 +600,19 @@ 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 */ 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, n, + SourceFactory::createExternal (DataType::AUDIO, *_session, + path, n, (mode == ImportAsTapeTrack ? Source::Destructive : Source::Flag (0)), @@ -702,7 +629,7 @@ Editor::embed_sndfiles (vector paths, bool multifile, goto out; } - ARDOUR_UI::instance()->flush_pending (); + gtk_main_iteration(); } } @@ -710,15 +637,16 @@ 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); + pop_canvas_cursor (); return ret; } 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; @@ -726,6 +654,7 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, uint32_t input_chan = 0; uint32_t output_chan = 0; bool use_timestamp; + vector track_names; use_timestamp = (pos == -1); @@ -763,6 +692,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) { @@ -779,10 +713,45 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, boost::shared_ptr fs = boost::dynamic_pointer_cast (*x); - if (fs) { - region_name = region_name_from_path (fs->path(), false, false, sources.size(), n); - } else{ - region_name = (*x)->name(); + 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; @@ -794,7 +763,7 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, */ framecnt_t len = (*x)->length (pos); if (len == 0) { - len = (60 / 120) * _session->frame_rate (); + len = (60.0 / 120.0) * _session->frame_rate (); } plist.add (ARDOUR::Properties::start, 0); @@ -833,6 +802,14 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, int n = 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); @@ -864,9 +841,8 @@ Editor::add_sources (vector paths, SourceList& sources, framepos_t& pos, 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]); rlen = (*r)->length(); @@ -880,6 +856,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) { @@ -891,7 +869,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, const string& new_track_name) { boost::shared_ptr ar = boost::dynamic_pointer_cast(region); boost::shared_ptr mr = boost::dynamic_pointer_cast(region); @@ -918,11 +896,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 (Operations::insert_file); 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; } @@ -938,7 +917,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; @@ -947,16 +929,18 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t 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(); - boost::shared_ptr copy (RegionFactory::create (region)); - begin_reversible_command (Operations::insert_file); + boost::shared_ptr copy (RegionFactory::create (region, true)); playlist->clear_changes (); playlist->add_region (copy, pos); _session->add_command (new StatefulDiffCommand (playlist)); - commit_reversible_command (); break; } @@ -969,12 +953,10 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, uint32_t 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)); - begin_reversible_command (Operations::insert_file); + boost::shared_ptr copy (RegionFactory::create (region, true)); playlist->clear_changes (); playlist->add_region (copy, pos); _session->add_command (new StatefulDiffCommand (playlist)); - commit_reversible_command (); } break; } @@ -995,8 +977,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; }