#include <gtkmm2ext/choice.h>
-#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"
}
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);
}
Editor::external_audio_dialog ()
{
vector<string> 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."));
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<AudioTimeAxisView*>(*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<MidiTimeAxisView*>(*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<string> upaths = sfbrowser->get_paths ();
- for (vector<string>::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
typedef std::map<PBD::ID,boost::shared_ptr<ARDOUR::Source> > 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"
}
void
-Editor::do_import (vector<string> paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, framepos_t& pos)
+Editor::do_import (vector<string> paths, ImportDisposition disposition, ImportMode mode, SrcQuality quality, framepos_t& pos)
{
boost::shared_ptr<Track> track;
vector<string> to_import;
bool ok = true;
- if (chns == Editing::ImportMergeFiles) {
+ if (disposition == Editing::ImportMergeFiles) {
/* create 1 region from all paths, add to 1 track,
ignore "track"
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 {
ipw.show ();
- switch (chns) {
+ switch (disposition) {
case Editing::ImportDistinctFiles:
to_import.clear ();
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:
}
void
-Editor::do_embed (vector<string> paths, ImportDisposition chns, ImportMode mode, framepos_t& pos)
+Editor::do_embed (vector<string> paths, ImportDisposition import_as, ImportMode mode, framepos_t& pos)
{
boost::shared_ptr<Track> track;
bool check_sample_rate = true;
vector<string> 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<string>::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);
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;
}
}
case Editing::ImportDistinctChannels:
for (vector<string>::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;
case Editing::ImportSerializeFiles:
for (vector<string>::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;
}
}
}
int
-Editor::import_sndfiles (vector<string> paths, ImportMode mode, SrcQuality quality, framepos_t& pos,
+Editor::import_sndfiles (vector<string> paths, ImportDisposition disposition, ImportMode mode, SrcQuality quality, framepos_t& pos,
int target_regions, int target_tracks, boost::shared_ptr<Track>& track, bool replace)
{
import_status.paths = paths;
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.
*/
import_status.paths,
import_status.sources,
import_status.pos,
+ disposition,
import_status.mode,
import_status.target_regions,
import_status.target_tracks,
int
Editor::embed_sndfiles (vector<string> 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>& track)
{
boost::shared_ptr<AudioFileSource> source;
set_canvas_cursor (_cursors->wait);
for (int n = 0; n < finfo.channels; ++n) {
+
try {
/* check if we have this thing embedded already */
if ((s = _session->source_by_path_and_channel (path, n)) == 0) {
source = boost::dynamic_pointer_cast<AudioFileSource> (
- SourceFactory::createReadable (DataType::AUDIO, *_session,
- path, n,
+ SourceFactory::createExternal (DataType::AUDIO, *_session,
+ path, n,
(mode == ImportAsTapeTrack
? Source::Destructive
: Source::Flag (0)),
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);
}
int
-Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos, ImportMode mode,
+Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos, ImportDisposition disposition, ImportMode mode,
int target_regions, int target_tracks, boost::shared_ptr<Track>& track, bool /*add_channel_suffix*/)
{
vector<boost::shared_ptr<Region> > regions;
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)
boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource> (*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();
+ }
+
+ 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;
*/
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);
int n = 0;
framepos_t rlen = 0;
+ begin_reversible_command (Operations::insert_file);
+
for (vector<boost::shared_ptr<Region> >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) {
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (*r);
}
}
+ commit_reversible_command ();
+
/* setup peak file building in another thread */
for (SourceList::iterator x = sources.begin(); x != sources.end(); ++x) {
int
Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t in_chans, uint32_t out_chans, framepos_t& pos,
- ImportMode mode, boost::shared_ptr<Track>& existing_track)
+ ImportMode mode, boost::shared_ptr<Track>& existing_track)
{
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(region);
boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(region);
boost::shared_ptr<Playlist> playlist = existing_track->playlist();
boost::shared_ptr<Region> copy (RegionFactory::create (region, region->properties()));
- begin_reversible_command (Operations::insert_file);
playlist->clear_changes ();
playlist->add_region (copy, pos);
_session->add_command (new StatefulDiffCommand (playlist));
- commit_reversible_command ();
break;
}
existing_track = at.front();
} else if (mr) {
- list<boost::shared_ptr<MidiTrack> > mt (_session->new_midi_track (Normal, 0, 1));
+ list<boost::shared_ptr<MidiTrack> > mt (_session->new_midi_track (ChanCount (DataType::MIDI, 1),
+ ChanCount (DataType::MIDI, 1),
+ boost::shared_ptr<PluginInfo>(),
+ Normal, 0, 1));
if (mt.empty()) {
return -1;
}
boost::shared_ptr<Playlist> playlist = existing_track->playlist();
- boost::shared_ptr<Region> copy (RegionFactory::create (region));
- begin_reversible_command (Operations::insert_file);
+ boost::shared_ptr<Region> copy (RegionFactory::create (region, true));
playlist->clear_changes ();
playlist->add_region (copy, pos);
_session->add_command (new StatefulDiffCommand (playlist));
- commit_reversible_command ();
break;
}
list<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (in_chans, out_chans, Destructive));
if (!at.empty()) {
boost::shared_ptr<Playlist> playlist = at.front()->playlist();
- boost::shared_ptr<Region> copy (RegionFactory::create (region));
- begin_reversible_command (Operations::insert_file);
+ boost::shared_ptr<Region> copy (RegionFactory::create (region, true));
playlist->clear_changes ();
playlist->add_region (copy, pos);
_session->add_command (new StatefulDiffCommand (playlist));
- commit_reversible_command ();
}
break;
}
void *
Editor::import_thread ()
{
- _session->import_audiofiles (import_status);
+ _session->import_files (import_status);
pthread_exit_pbd (0);
/*NOTREACHED*/
return 0;
projects / ardour.git / blobdiff