void
Editor::add_external_audio_action (ImportMode mode)
{
- nframes_t& pos = edit_cursor->current_frame;
- AudioTrack* track = 0;
-
- if (!selection->tracks.empty()) {
- AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(selection->tracks.front());
- if (atv) {
- track = atv->audio_track();
- }
- }
-
- bring_in_external_audio (mode, track, pos);
}
-
void
Editor::external_audio_dialog ()
{
msg.run ();
return;
}
+
+ if (sfbrowser == 0) {
+ sfbrowser = new SoundFileOmega (*this, _("Add existing audio"), session, selection->tracks.size());
+ } else {
+ sfbrowser->reset (selection->tracks.size());
+ }
- SoundFileBrowser browser (_("Add existing audio"), session);
- SoundFileOptionsDialog* options = 0;
-
- browser.show_all ();
+ sfbrowser->show_all ();
- while (!options) {
+ int response = sfbrowser->run ();
- int response = browser.run ();
-
- switch (response) {
- case RESPONSE_OK:
- break;
- default:
- // cancel from the browser - we are done
- return;
- }
-
- paths = browser.get_paths ();
+ sfbrowser->hide ();
- options = new SoundFileOptionsDialog (browser, paths, selection->tracks.size());
- options->show_all ();
-
- response = options->run ();
- switch (response) {
- case RESPONSE_OK:
- // leave options non-null so that we break out of the loop
- break;
- default:
- // back to the browser another try
- delete options;
- options = 0;
- break;
- }
+ switch (response) {
+ case RESPONSE_OK:
+ break;
+ default:
+ // cancel from the browser - we are done
+ return;
}
- browser.hide ();
- options->hide ();
-
/* lets do it */
- AudioTrack* track = 0;
+ paths = sfbrowser->get_paths ();
- if (!selection->tracks.empty()) {
- AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(selection->tracks.front());
- if (atv) {
- track = atv->audio_track();
- }
+ ImportPosition pos = sfbrowser->get_position ();
+ ImportMode mode = sfbrowser->get_mode ();
+ ImportDisposition chns = sfbrowser->get_channel_disposition ();
+ nframes64_t where;
+
+ switch (pos) {
+ case ImportAtEditCursor:
+ where = edit_cursor->current_frame;
+ break;
+ case ImportAtTimestamp:
+ where = -1;
+ break;
+ case ImportAtPlayhead:
+ where = playhead_cursor->current_frame;
+ break;
+ case ImportAtStart:
+ where = session->current_start_frame();
+ break;
}
- if (options->import.get_active()) {
- do_import (paths, options->split_files.get_active(), options->mode, track, edit_cursor->current_frame);
+ if (sfbrowser->import.get_active()) {
+ do_import (paths, chns, mode, where);
} else {
- do_embed (paths, options->split_files.get_active(), options->mode, track, edit_cursor->current_frame);
+ do_embed (paths, chns, mode, where);
}
-
- delete options;
}
-void
-Editor::bring_in_external_audio (ImportMode mode, AudioTrack* track, nframes_t& pos)
+boost::shared_ptr<AudioTrack>
+Editor::get_nth_selected_audio_track (int nth) const
{
-}
+ AudioTimeAxisView* atv;
+ TrackSelection::iterator x;
+
+ for (x = selection->tracks.begin(); nth > 0 && x != selection->tracks.end(); ++x) {
+ if (dynamic_cast<AudioTimeAxisView*>(*x)) {
+ --nth;
+ }
+ }
+
+ if (x == selection->tracks.end()) {
+ atv = dynamic_cast<AudioTimeAxisView*>(selection->tracks.back());
+ } else {
+ atv = dynamic_cast<AudioTimeAxisView*>(*x);
+ }
+
+ if (!atv) {
+ return boost::shared_ptr<AudioTrack>();
+ }
+
+ return atv->audio_track();
+}
void
-Editor::do_import (vector<ustring> paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos)
+Editor::do_import (vector<ustring> paths, ImportDisposition chns, ImportMode mode, nframes64_t& pos)
{
- /* SFDB sets "multichan" to true to indicate "split channels"
- so reverse the setting to match the way libardour
- interprets it.
- */
-
- import_status.multichan = !split;
+ boost::shared_ptr<AudioTrack> track;
+ vector<ustring> to_import;
+ bool ok = false;
+ int nth = 0;
if (interthread_progress_window == 0) {
build_interthread_progress_window ();
}
- vector<ustring> to_import;
+ switch (chns) {
+ case Editing::ImportDistinctFiles:
+ for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
- for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
+ to_import.clear ();
+ to_import.push_back (*a);
+
+ if (mode == Editing::ImportToTrack) {
+ track = get_nth_selected_audio_track (nth++);
+ }
+
+ if (import_sndfiles (to_import, mode, pos, 1, -1, track)) {
+ goto out;
+ }
+
+ }
+ break;
- to_import.clear ();
- to_import.push_back (*a);
+ case Editing::ImportDistinctChannels:
+ for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
- import_sndfile (to_import, mode, track, pos);
+ to_import.clear ();
+ to_import.push_back (*a);
+
+ if (import_sndfiles (to_import, mode, pos, -1, -1, track)) {
+ goto out;
+ }
+
+ }
+ break;
+
+ case Editing::ImportMergeFiles:
+ /* create 1 region from all paths, add to 1 track,
+ ignore "track"
+ */
+ if (import_sndfiles (paths, mode, pos, 1, 1, track)) {
+ goto out;
+ }
+ break;
+
+ case Editing::ImportSerializeFiles:
+ for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
+
+ to_import.clear ();
+ to_import.push_back (*a);
+
+ /* create 1 region from this path, add to 1 track,
+ reuse "track" across paths
+ */
+
+ if (import_sndfiles (to_import, mode, pos, 1, 1, track)) {
+ goto out;
+ }
+
+ }
+ break;
+ }
+
+ ok = true;
+
+ out:
+ if (ok) {
+ session->save_state ("");
}
interthread_progress_window->hide_all ();
}
bool
-Editor::idle_do_embed (vector<ustring> paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos)
+Editor::idle_do_embed (vector<ustring> paths, ImportDisposition chns, ImportMode mode, nframes64_t& pos)
{
- _do_embed (paths, split, mode, track, pos);
+ _do_embed (paths, chns, mode, pos);
return false;
}
void
-Editor::do_embed (vector<ustring> paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos)
+Editor::do_embed (vector<ustring> paths, ImportDisposition chns, ImportMode mode, nframes64_t& pos)
{
#ifdef GTKOSX
- Glib::signal_idle().connect (bind (mem_fun (*this, &Editor::idle_do_embed), paths, split, mode, track, pos));
+ Glib::signal_idle().connect (bind (mem_fun (*this, &Editor::idle_do_embed), paths, chns, mode, pos));
#else
- _do_embed (paths, split, mode, track, pos);
+ _do_embed (paths, chns, mode, pos);
#endif
}
void
-Editor::_do_embed (vector<ustring> paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos)
+Editor::_do_embed (vector<ustring> paths, ImportDisposition chns, ImportMode mode, nframes64_t& pos)
{
- bool multiple_files = paths.size() > 1;
+ boost::shared_ptr<AudioTrack> track;
bool check_sample_rate = true;
- vector<ustring>::iterator a;
-
- for (a = paths.begin(); a != paths.end(); ) {
-
- Glib::ustring path = *a;
- Glib::ustring pair_base;
- vector<ustring> 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();
+ bool ok = false;
+ vector<ustring> to_embed;
+ bool multi = paths.size() > 1;
+ int nth = 0;
- for (vector<Glib::ustring>::iterator b = paths.begin(); b != paths.end(); ) {
+ switch (chns) {
+ case Editing::ImportDistinctFiles:
+ for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
- if (((*b).substr (0, len) == pair_base) && ((*b).length() == path.length())) {
+ to_embed.clear ();
+ to_embed.push_back (*a);
- to_embed.push_back (*b);
-
- /* don't process this one again */
-
- b = paths.erase (b);
- break;
+ if (mode == Editing::ImportToTrack) {
+ track = get_nth_selected_audio_track (nth++);
+ }
- } else {
- ++b;
- }
+ if (embed_sndfiles (to_embed, multi, check_sample_rate, mode, pos, 1, -1, track) < -1) {
+ goto out;
}
}
+ break;
+
+ case Editing::ImportDistinctChannels:
+ for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
- if (to_embed.size() > 1) {
-
- vector<string> choices;
-
- choices.push_back (string_compose (_("Import as a %1 region"),
- to_embed.size() > 2 ? _("multichannel") : _("stereo")));
- choices.push_back (_("Import as multiple regions"));
-
- 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) < -1) {
- break;
- }
-
- } else {
-
- /* one thing per file */
-
- vector<ustring> foo;
+ to_embed.clear ();
+ to_embed.push_back (*a);
- for (vector<ustring>::iterator x = to_embed.begin(); x != to_embed.end(); ++x) {
+ if (embed_sndfiles (to_embed, multi, check_sample_rate, mode, pos, -1, -1, track) < -1) {
+ goto out;
+ }
+ }
+ break;
- foo.clear ();
- foo.push_back (*x);
+ case Editing::ImportMergeFiles:
+ if (embed_sndfiles (paths, multi, check_sample_rate, mode, pos, 1, 1, track) < -1) {
+ goto out;
+ }
+ break;
- if (embed_sndfile (foo, split, multiple_files, check_sample_rate, mode, track, pos) < -1) {
- break;
- }
- }
- }
+ case Editing::ImportSerializeFiles:
+ for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
- } else {
+ to_embed.clear ();
+ to_embed.push_back (*a);
- if (embed_sndfile (to_embed, split, multiple_files, check_sample_rate, mode, track, pos) < -1) {
- break;
+ if (embed_sndfiles (to_embed, multi, check_sample_rate, mode, pos, 1, 1, track) < -1) {
+ goto out;
}
}
+ break;
}
+
+ ok = true;
- if (a == paths.end()) {
+ out:
+ if (ok) {
session->save_state ("");
}
}
int
-Editor::import_sndfile (vector<ustring> paths, ImportMode mode, AudioTrack* track, nframes_t& pos)
+Editor::import_sndfiles (vector<ustring> paths, ImportMode mode, nframes64_t& pos,
+ int target_regions, int target_tracks, boost::shared_ptr<AudioTrack>& track)
{
WindowTitle title = string_compose (_("importing %1"), paths.front());
interthread_progress_connection.disconnect ();
/* import thread finished - see if we should build a new track */
+
+ boost::shared_ptr<AudioRegion> r;
- if (!import_status.new_regions.empty()) {
- boost::shared_ptr<AudioRegion> region (import_status.new_regions.front());
- finish_bringing_in_audio (region, region->n_channels(), region->n_channels(), track, pos, mode);
+ if (import_status.cancel || import_status.sources.empty()) {
+ goto out;
+ }
+
+ if (add_sources (paths, import_status.sources, pos, mode, target_regions, target_tracks, track) == 0) {
+ session->save_state ("");
}
+ out:
track_canvas.get_window()->set_cursor (*current_canvas_cursor);
return 0;
}
int
-Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_files, bool& check_sample_rate, ImportMode mode,
- AudioTrack* track, nframes_t& pos)
+Editor::embed_sndfiles (vector<Glib::ustring> paths, bool multifile,
+ bool& check_sample_rate, ImportMode mode, nframes64_t& pos, int target_regions, int target_tracks,
+ boost::shared_ptr<AudioTrack>& track)
{
boost::shared_ptr<AudioFileSource> source;
SourceList sources;
- boost::shared_ptr<AudioRegion> region;
string linked_path;
SoundFileInfo finfo;
- ustring region_name;
- uint32_t input_chan = 0;
- uint32_t output_chan = 0;
int ret = 0;
track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
if (check_sample_rate && (finfo.samplerate != (int) session->frame_rate())) {
vector<string> choices;
- if (multiple_files) {
+ if (multifile) {
choices.push_back (_("Cancel entire import"));
choices.push_back (_("Don't embed it"));
choices.push_back (_("Embed all without questions"));
}
track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
- // ARDOUR_UI::instance()->flush_pending ();
-
- /* make the proper number of channels in the region */
-
- input_chan += finfo.channels;
- for (int n = 0; n < finfo.channels; ++n)
- {
+ for (int n = 0; n < finfo.channels; ++n) {
try {
/* check if we have this thing embedded already */
goto out;
}
- if (sources[0]->natural_position() != 0) {
- pos = sources[0]->natural_position();
- }
+ ret = add_sources (paths, sources, pos, mode, target_regions, target_tracks, track);
- region_name = region_name_from_path (paths.front(), (sources.size() > 1));
-
- region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (sources, 0, sources[0]->length(), region_name, 0,
- Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)));
+ out:
+ track_canvas.get_window()->set_cursor (*current_canvas_cursor);
+ return ret;
+}
+
+int
+Editor::add_sources (vector<Glib::ustring> paths, SourceList& sources, nframes64_t& pos, ImportMode mode,
+ int target_regions, int target_tracks, boost::shared_ptr<AudioTrack>& track)
+{
+ vector<boost::shared_ptr<AudioRegion> > regions;
+ ustring region_name;
+ uint32_t input_chan = 0;
+ uint32_t output_chan = 0;
+
+ if (pos == -1) { // "use timestamp"
+ if (sources[0]->natural_position() != 0) {
+ pos = sources[0]->natural_position();
+ } else {
+ // XXX is this the best alternative ?
+ pos = edit_cursor->current_frame;
+ }
+ }
+
+ if (target_regions == 1) {
+
+ /* take all the sources we have and package them up as a region */
+
+ region_name = region_name_from_path (paths.front(), (sources.size() > 1));
+
+ regions.push_back (boost::dynamic_pointer_cast<AudioRegion>
+ (RegionFactory::create (sources, 0, sources[0]->length(), region_name, 0,
+ Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External))));
+
+ } else if (target_regions == -1) {
+
+ /* take each source and create a region for each one */
+
+ SourceList just_one;
+ SourceList::iterator x;
+
+ for (x = sources.begin(); x != sources.end(); ++x) {
+
+ just_one.clear ();
+ just_one.push_back (*x);
+
+ boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (*x);
+
+ region_name = region_name_from_path (afs->path(), false);
+
+ regions.push_back (boost::dynamic_pointer_cast<AudioRegion>
+ (RegionFactory::create (just_one, 0, (*x)->length(), region_name, 0,
+ Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External))));
+
+ }
+ }
+
+ if (target_regions == 1) {
+ input_chan = regions.front()->n_channels();
+ } else {
+ if (target_tracks == 1) {
+ input_chan = regions.size();
+ } else {
+ input_chan = 1;
+ }
+ }
if (Config->get_output_auto_connect() & AutoConnectMaster) {
output_chan = (session->master_out() ? session->master_out()->n_inputs() : input_chan);
output_chan = input_chan;
}
- finish_bringing_in_audio (region, input_chan, output_chan, track, pos, mode);
-
- out:
- track_canvas.get_window()->set_cursor (*current_canvas_cursor);
- return ret;
-}
+ for (vector<boost::shared_ptr<AudioRegion> >::iterator r = regions.begin(); r != regions.end(); ++r) {
+
+ finish_bringing_in_audio (*r, input_chan, output_chan, pos, mode, track);
+
+ if (target_tracks != 1) {
+ track.reset ();
+ } else {
+ pos += (*r)->length();
+ }
+ }
+ return 0;
+}
+
int
-Editor::finish_bringing_in_audio (boost::shared_ptr<AudioRegion> region, uint32_t in_chans, uint32_t out_chans, AudioTrack* track, nframes_t& pos, ImportMode mode)
+Editor::finish_bringing_in_audio (boost::shared_ptr<AudioRegion> region, uint32_t in_chans, uint32_t out_chans, nframes64_t& pos,
+ ImportMode mode, boost::shared_ptr<AudioTrack>& existing_track)
{
+
switch (mode) {
case ImportAsRegion:
/* relax, its been done */
break;
case ImportToTrack:
- if (track) {
- boost::shared_ptr<Playlist> playlist = track->diskstream()->playlist();
-
- boost::shared_ptr<AudioRegion> copy (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region)));
- begin_reversible_command (_("insert sndfile"));
- XMLNode &before = playlist->get_state();
- playlist->add_region (copy, pos);
- session->add_command (new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
- commit_reversible_command ();
+ {
+ if (!existing_track) {
- pos += region->length();
+ if (selection->tracks.empty()) {
+ return -1;
+ }
+
+ AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(selection->tracks.front());
+
+ if (!atv) {
+ return -1;
+ }
+
+ existing_track = atv->audio_track();
}
+
+ boost::shared_ptr<Playlist> playlist = existing_track->diskstream()->playlist();
+ boost::shared_ptr<AudioRegion> copy (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region)));
+ begin_reversible_command (_("insert sndfile"));
+ XMLNode &before = playlist->get_state();
+ playlist->add_region (copy, pos);
+ session->add_command (new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
+ commit_reversible_command ();
break;
-
+ }
+
case ImportAsTrack:
{
- list<boost::shared_ptr<AudioTrack> > at (session->new_audio_track (in_chans, out_chans, Normal, 1));
- if (!at.empty()) {
- boost::shared_ptr<AudioRegion> copy (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region)));
- at.front()->diskstream()->playlist()->add_region (copy, pos);
+ if (!existing_track) {
+ list<boost::shared_ptr<AudioTrack> > at (session->new_audio_track (in_chans, out_chans, Normal, 1));
+ if (at.empty()) {
+ return -1;
+ }
+ existing_track = at.front();
+ existing_track->set_name (basename_nosuffix (region->name()), this);
}
+ boost::shared_ptr<AudioRegion> copy (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region)));
+ existing_track->diskstream()->playlist()->add_region (copy, pos);
break;
}
+
case ImportAsTapeTrack:
{
list<boost::shared_ptr<AudioTrack> > at (session->new_audio_track (in_chans, out_chans, Destructive));
if (!at.empty()) {
boost::shared_ptr<AudioRegion> copy (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region)));
+ at.front()->set_name (basename_nosuffix (copy->name()), this);
at.front()->diskstream()->playlist()->add_region (copy, pos);
}
break;