X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audio_import.cc;h=7067d9dce09a735a9079fca959f300caa1da3e82;hb=afa29d319007ce20bd1546c343e9277c58c80c1a;hp=4128348e3a3a4c29b087c0a6a3faf1738d745722;hpb=199dce57f35014189f21c76fff32e0752bcc8c15;p=ardour.git diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 4128348e3a..7067d9dce0 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include #include "ardour_ui.h" @@ -47,13 +49,14 @@ using namespace PBD; using namespace sigc; using namespace Gtk; using namespace Editing; +using Glib::ustring; /* Functions supporting the incorporation of external (non-captured) audio material into ardour */ void Editor::add_external_audio_action (ImportMode mode) { - jack_nframes_t& pos = edit_cursor->current_frame; + nframes_t& pos = edit_cursor->current_frame; AudioTrack* track = 0; if (!selection->tracks.empty()) { @@ -67,7 +70,7 @@ Editor::add_external_audio_action (ImportMode mode) } void -Editor::bring_in_external_audio (ImportMode mode, AudioTrack* track, jack_nframes_t& pos, bool prompt) +Editor::bring_in_external_audio (ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt) { if (session == 0) { MessageDialog msg (0, _("You can't import or embed an audiofile until you have a session loaded.")); @@ -80,11 +83,11 @@ Editor::bring_in_external_audio (ImportMode mode, AudioTrack* track, jack_nframe switch (sfdb.run()) { case SoundFileOmega::ResponseImport: - do_import (sfdb.get_paths(), sfdb.get_split(), mode, track, pos, prompt); + do_import (sfdb.get_paths(), sfdb.get_split(), sfdb.get_mode(), track, pos, prompt); break; case SoundFileOmega::ResponseEmbed: - do_embed (sfdb.get_paths(), sfdb.get_split(), mode, track, pos, prompt); + do_embed (sfdb.get_paths(), sfdb.get_split(), sfdb.get_mode(), track, pos, prompt); break; default: @@ -93,7 +96,7 @@ Editor::bring_in_external_audio (ImportMode mode, AudioTrack* track, jack_nframe } void -Editor::do_import (vector paths, bool split, ImportMode mode, AudioTrack* track, jack_nframes_t& pos, bool prompt) +Editor::do_import (vector paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt) { /* SFDB sets "multichan" to true to indicate "split channels" so reverse the setting to match the way libardour @@ -105,49 +108,119 @@ Editor::do_import (vector paths, bool split, ImportMode mode, Aud if (interthread_progress_window == 0) { build_interthread_progress_window (); } - - /* for each path that was selected, import it and then potentially create a new track - containing the new region as the sole contents. - */ - for (vector::iterator i = paths.begin(); i != paths.end(); ++i ) { - import_sndfile (*i, mode, track, pos); + vector to_import; + + for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { + + to_import.clear (); + to_import.push_back (*a); + + import_sndfile (to_import, mode, track, pos); } interthread_progress_window->hide_all (); } void -Editor::do_embed (vector paths, bool split, ImportMode mode, AudioTrack* track, jack_nframes_t& pos, bool prompt) +Editor::do_embed (vector paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt) { bool multiple_files = paths.size() > 1; bool check_sample_rate = true; - vector::iterator i; + vector::iterator a; + + for (a = paths.begin(); a != paths.end(); ) { - for (i = paths.begin(); i != paths.end(); ++i) { - int ret = embed_sndfile (*i, split, multiple_files, check_sample_rate, mode, track, pos, prompt); + Glib::ustring path = *a; + Glib::ustring pair_base; + vector to_embed; + + to_embed.push_back (path); + a = paths.erase (a); + + if (path_is_paired (path, pair_base)) { + + ustring::size_type len = pair_base.length(); - if (ret < -1) { - break; + for (vector::iterator b = paths.begin(); b != paths.end(); ) { + + if (((*b).substr (0, len) == pair_base) && ((*b).length() == path.length())) { + + to_embed.push_back (*b); + + /* don't process this one again */ + + b = paths.erase (b); + break; + + } else { + ++b; + } + } } - } - if (i == paths.end()) { + if (to_embed.size() > 1) { + + vector choices; + + choices.push_back (string_compose (_("Import as a %1 region"), + to_embed.size() > 2 ? _("multichannel") : _("stereo"))); + choices.push_back (_("Import as multiple regions")); + + Gtkmm2ext::Choice chooser (string_compose (_("Paired files detected (%1, %2 ...).\nDo you want to:"), + to_embed[0], + to_embed[1]), + choices); + + if (chooser.run () == 0) { + + /* keep them paired */ + + if (embed_sndfile (to_embed, split, multiple_files, check_sample_rate, mode, track, pos, prompt) < -1) { + break; + } + + } else { + + /* one thing per file */ + + vector foo; + + for (vector::iterator x = to_embed.begin(); x != to_embed.end(); ++x) { + + foo.clear (); + foo.push_back (*x); + + if (embed_sndfile (foo, split, multiple_files, check_sample_rate, mode, track, pos, prompt) < -1) { + break; + } + } + } + + } else { + + if (embed_sndfile (to_embed, split, multiple_files, check_sample_rate, mode, track, pos, prompt) < -1) { + break; + } + } + } + + if (a == paths.end()) { session->save_state (""); } } int -Editor::import_sndfile (Glib::ustring path, ImportMode mode, AudioTrack* track, jack_nframes_t& pos) +Editor::import_sndfile (vector paths, ImportMode mode, AudioTrack* track, nframes_t& pos) { - interthread_progress_window->set_title (string_compose (_("ardour: importing %1"), path)); + interthread_progress_window->set_title (string_compose (_("ardour: importing %1"), paths.front())); interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE); interthread_progress_window->show_all (); interthread_progress_bar.set_fraction (0.0f); interthread_cancel_label.set_text (_("Cancel Import")); current_interthread_info = &import_status; - import_status.pathname = path; + import_status.paths = paths; import_status.done = false; import_status.cancel = false; import_status.freeze = false; @@ -159,8 +232,8 @@ Editor::import_sndfile (Glib::ustring path, ImportMode mode, AudioTrack* track, track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); ARDOUR_UI::instance()->flush_pending (); - /* start import thread for this path. this will ultimately call Session::import_audiofile() - and if successful will add the file as a region to the session region list. + /* start import thread for this spec. this will ultimately call Session::import_audiofile() + and if successful will add the file(s) as a region to the session region list. */ pthread_create_and_store ("import", &import_status.thread, 0, _import_thread, this); @@ -176,8 +249,8 @@ Editor::import_sndfile (Glib::ustring path, ImportMode mode, AudioTrack* track, /* import thread finished - see if we should build a new track */ if (!import_status.new_regions.empty()) { - AudioRegion& region (*import_status.new_regions.front()); - finish_bringing_in_audio (region, region.n_channels(), region.n_channels(), track, pos, mode); + boost::shared_ptr region (import_status.new_regions.front()); + finish_bringing_in_audio (region, region->n_channels(), region->n_channels(), track, pos, mode); } track_canvas.get_window()->set_cursor (*current_canvas_cursor); @@ -185,120 +258,133 @@ Editor::import_sndfile (Glib::ustring path, ImportMode mode, AudioTrack* track, } int -Editor::embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool& check_sample_rate, ImportMode mode, - AudioTrack* track, jack_nframes_t& pos, bool prompt) +Editor::embed_sndfile (vector paths, bool split, bool multiple_files, bool& check_sample_rate, ImportMode mode, + AudioTrack* track, nframes_t& pos, bool prompt) { - AudioFileSource *source = 0; /* keep g++ quiet */ - AudioRegion::SourceList sources; - AudioRegion* region; + boost::shared_ptr source; + SourceList sources; + boost::shared_ptr region; string idspec; string linked_path; SoundFileInfo finfo; - string region_name; - uint32_t input_chan; - uint32_t output_chan; + ustring region_name; + uint32_t input_chan = 0; + uint32_t output_chan = 0; track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); ARDOUR_UI::instance()->flush_pending (); - /* lets see if we can link it into the session */ - - linked_path = session->sound_dir(); - linked_path += Glib::path_get_basename (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; - } - - /* note that we temporarily truncated _id at the colon */ + for (vector::iterator p = paths.begin(); p != paths.end(); ++p) { - string error_msg; + ustring path = *p; - if (!AudioFileSource::get_soundfile_info (path, finfo, error_msg)) { - error << string_compose(_("Editor: cannot open file \"%1\", (%2)"), selection, error_msg ) << endmsg; - return 0; - } - - if (check_sample_rate && (finfo.samplerate != (int) session->frame_rate())) { - vector choices; + /* lets see if we can link it into the session */ - if (multiple_files) { - choices.push_back (_("Cancel entire import")); - choices.push_back (_("Don't embed it")); - choices.push_back (_("Embed all without questions")); - } else { - choices.push_back (_("Cancel")); + linked_path = session->sound_dir(); + linked_path += '/'; + linked_path += Glib::path_get_basename (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; } - - choices.push_back (_("Embed it anyway")); - Gtkmm2ext::Choice rate_choice ( - string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path), - choices, false); + /* note that we temporarily truncated _id at the colon */ + + string error_msg; - switch (rate_choice.run()) { - case 0: /* stop a multi-file import */ - case 1: /* don't import this one */ - return -1; - case 2: /* do it, and the rest without asking */ - check_sample_rate = false; - break; - case 3: /* do it */ - break; - default: - return -2; + if (!AudioFileSource::get_soundfile_info (path, finfo, error_msg)) { + error << string_compose(_("Editor: cannot open file \"%1\", (%2)"), selection, error_msg ) << endmsg; + return 0; } - } - - track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); - ARDOUR_UI::instance()->flush_pending (); - - /* make the proper number of channels in the region */ - - for (int n = 0; n < finfo.channels; ++n) - { - idspec = path; - idspec += string_compose(":%1", n); - try { - source = AudioFileSource::create (idspec.c_str(), (mode == ImportAsTrack ? AudioFileSource::Destructive : AudioFileSource::Flag (0))); - sources.push_back(source); - } + if (check_sample_rate && (finfo.samplerate != (int) session->frame_rate())) { + vector choices; + + if (multiple_files) { + choices.push_back (_("Cancel entire import")); + choices.push_back (_("Don't embed it")); + choices.push_back (_("Embed all without questions")); + } else { + choices.push_back (_("Cancel")); + } + + choices.push_back (_("Embed it anyway")); + + Gtkmm2ext::Choice rate_choice ( + string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path), + choices, false); + + switch (rate_choice.run()) { + case 0: /* stop a multi-file import */ + case 1: /* don't import this one */ + return -1; + case 2: /* do it, and the rest without asking */ + check_sample_rate = false; + break; + case 3: /* do it */ + break; + default: + return -2; + } + } - catch (failed_constructor& err) { - error << string_compose(_("could not open %1"), path) << endmsg; - goto out; - } + track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); + ARDOUR_UI::instance()->flush_pending (); + + /* make the proper number of channels in the region */ - ARDOUR_UI::instance()->flush_pending (); - } + input_chan += finfo.channels; + for (int n = 0; n < finfo.channels; ++n) + { + idspec = path; + idspec += string_compose(":%1", n); + + try { + source = boost::dynamic_pointer_cast (SourceFactory::createReadable + (*session, idspec, + (mode == ImportAsTapeTrack ? + AudioFileSource::Destructive : + AudioFileSource::Flag (0)))); + sources.push_back(source); + } + + catch (failed_constructor& err) { + error << string_compose(_("could not open %1"), path) << endmsg; + goto out; + } + + ARDOUR_UI::instance()->flush_pending (); + } + } + if (sources.empty()) { goto out; } + + if (sources[0]->natural_position() != 0) { + pos = sources[0]->natural_position(); + } + + region_name = region_name_from_path (paths.front(), (sources.size() > 1)); - region_name = PBD::basename_nosuffix (path); - region_name += "-0"; - - region = new AudioRegion (sources, 0, sources[0]->length(), region_name, 0, - Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)); + region = boost::dynamic_pointer_cast (RegionFactory::create (sources, 0, sources[0]->length(), region_name, 0, + Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External))); - input_chan = finfo.channels; - - if (session->get_output_auto_connect() & Session::AutoConnectMaster) { + if (Config->get_output_auto_connect() & AutoConnectMaster) { output_chan = (session->master_out() ? session->master_out()->n_inputs() : input_chan); } else { output_chan = input_chan; } - - finish_bringing_in_audio (*region, input_chan, output_chan, track, pos, mode); + + finish_bringing_in_audio (region, input_chan, output_chan, track, pos, mode); out: track_canvas.get_window()->set_cursor (*current_canvas_cursor); @@ -306,10 +392,8 @@ Editor::embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool } int -Editor::finish_bringing_in_audio (AudioRegion& region, uint32_t in_chans, uint32_t out_chans, AudioTrack* track, jack_nframes_t& pos, ImportMode mode) +Editor::finish_bringing_in_audio (boost::shared_ptr region, uint32_t in_chans, uint32_t out_chans, AudioTrack* track, nframes_t& pos, ImportMode mode) { - AudioRegion* copy; - switch (mode) { case ImportAsRegion: /* relax, its been done */ @@ -317,35 +401,35 @@ Editor::finish_bringing_in_audio (AudioRegion& region, uint32_t in_chans, uint32 case ImportToTrack: if (track) { - Playlist* playlist = track->diskstream()->playlist(); + boost::shared_ptr playlist = track->diskstream()->playlist(); - AudioRegion* copy = new AudioRegion (region); + boost::shared_ptr copy (boost::dynamic_pointer_cast (RegionFactory::create (region))); begin_reversible_command (_("insert sndfile")); XMLNode &before = playlist->get_state(); - playlist->add_region (*copy, pos); + playlist->add_region (copy, pos); session->add_command (new MementoCommand(*playlist, &before, &playlist->get_state())); commit_reversible_command (); - pos += region.length(); + pos += region->length(); } break; case ImportAsTrack: { - vector > at (session->new_audio_track (in_chans, out_chans, Normal, 1)); + list > at (session->new_audio_track (in_chans, out_chans, Normal, 1)); if (!at.empty()) { - copy = new AudioRegion (region); - at.front()->diskstream()->playlist()->add_region (*copy, pos); + boost::shared_ptr copy (boost::dynamic_pointer_cast (RegionFactory::create (region))); + at.front()->diskstream()->playlist()->add_region (copy, pos); } break; } case ImportAsTapeTrack: { - vector > at (session->new_audio_track (in_chans, out_chans, Destructive)); + list > at (session->new_audio_track (in_chans, out_chans, Destructive)); if (!at.empty()) { - copy = new AudioRegion (region); - at.front()->diskstream()->playlist()->add_region (*copy, pos); + boost::shared_ptr copy (boost::dynamic_pointer_cast (RegionFactory::create (region))); + at.front()->diskstream()->playlist()->add_region (copy, pos); } break; }