#include "pbd/pthread_utils.h"
#include "pbd/basename.h"
#include "pbd/shortpath.h"
+#include "pbd/stateful_diff_command.h"
#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/smf_source.h"
#include "ardour/source_factory.h"
-#include "ardour/session.h"
+#include "ardour/utils.h"
#include "pbd/memento_command.h"
#include "ardour_ui.h"
+#include "cursor_context.h"
#include "editor.h"
#include "sfdb_ui.h"
#include "editing.h"
#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"
+#include "editor_cursors.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace Editing;
-using Glib::ustring;
+using std::string;
/* Functions supporting the incorporation of external (non-captured) audio material into ardour */
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, 0, true, mode_hint);
} else {
sfbrowser->set_mode (mode_hint);
}
void
Editor::external_audio_dialog ()
{
- vector<Glib::ustring> paths;
- uint32_t track_cnt;
+ vector<string> paths;
+ 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 */
-
- paths = sfbrowser->get_paths ();
-
- ImportPosition pos = sfbrowser->get_position ();
- ImportMode mode = sfbrowser->get_mode ();
- ImportDisposition chns = sfbrowser->get_channel_disposition ();
- nframes64_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
Editor::session_import_dialog ()
{
SessionImportDialog dialog (_session);
- ensure_float (dialog);
dialog.run ();
}
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"
{
string wave_name (Glib::path_get_basename(path));
- SourceMap all_sources = _session->get_sources();
- bool wave_name_exists = false;
+ bool already_exists = false;
+ uint32_t existing;
- for (SourceMap::iterator i = all_sources.begin(); i != all_sources.end(); ++i) {
- string tmp (Glib::path_get_basename (i->second->path()));
- if (tmp == wave_name) {
- wave_name_exists = true;
- break;
- }
+ if ((existing = _session->count_sources_by_origin (path)) > 0) {
+ already_exists = true;
}
int function = 1;
- if (wave_name_exists) {
+ if (already_exists) {
string message;
if (all_or_nothing) {
// updating is still disabled
}
void
-Editor::do_import (vector<ustring> paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, nframes64_t& pos)
+Editor::do_import (vector<string> paths,
+ ImportDisposition disposition,
+ ImportMode mode,
+ SrcQuality quality,
+ framepos_t& pos,
+ ARDOUR::PluginInfoPtr instrument)
{
boost::shared_ptr<Track> track;
- vector<ustring> to_import;
+ vector<string> to_import;
int nth = 0;
+ bool use_timestamp = (pos == -1);
- if (interthread_progress_window == 0) {
- build_interthread_progress_window ();
- }
+ current_interthread_info = &import_status;
+ import_status.current = 1;
+ import_status.total = paths.size ();
+ import_status.all_done = false;
+
+ ImportProgressWindow ipw (&import_status, _("Import"), _("Cancel Import"));
+
+ bool ok = true;
- if (chns == Editing::ImportMergeFiles) {
+ if (disposition == Editing::ImportMergeFiles) {
/* create 1 region from all paths, add to 1 track,
ignore "track"
*/
bool cancel = false;
- for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
+ for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) {
int check = check_whether_and_how_to_import(*a, false);
if (check == 2) {
cancel = true;
}
}
- if (!cancel) {
- import_sndfiles (paths, mode, quality, pos, 1, 1, track, false, paths.size());
+ if (cancel) {
+ ok = false;
+ } else {
+ ipw.show ();
+ ok = (import_sndfiles (paths, disposition, mode, quality, pos, 1, 1, track, false, instrument) == 0);
+ import_status.sources.clear();
}
} else {
- for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
+ bool replace = false;
- int const check = check_whether_and_how_to_import (*a, true);
+ for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) {
- if (check != 2) {
- to_import.push_back (*a);
- }
- }
+ const int check = check_whether_and_how_to_import (*a, true);
- bool ok = true;
+ switch (check) {
+ case 2:
+ // user said skip
+ continue;
+ case 0:
+ fatal << "Updating existing sources should be disabled!" << endmsg;
+ abort(); /* NOTREACHED*/
+ break;
+ case 1:
+ replace = false;
+ break;
+ default:
+ fatal << "Illegal return " << check << " from check_whether_and_how_to_import()!" << endmsg;
+ abort(); /* NOTREACHED*/
+ }
- switch (chns) {
- case Editing::ImportDistinctFiles:
+ /* have to reset this for every file we handle */
- if (mode == Editing::ImportToTrack) {
- track = get_nth_selected_audio_track (nth++);
+ if (use_timestamp) {
+ pos = -1;
}
- ok = (import_sndfiles (to_import, mode, quality, pos, 1, -1, track, false, to_import.size()) == 0);
- break;
+ ipw.show ();
+
+ 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, disposition, mode, quality, pos, 1, -1, track, replace, instrument) == 0);
+ import_status.sources.clear();
+ break;
+
+ case Editing::ImportDistinctChannels:
+
+ to_import.clear ();
+ to_import.push_back (*a);
+
+ ok = (import_sndfiles (to_import, disposition, mode, quality, pos, -1, -1, track, replace, instrument) == 0);
+ import_status.sources.clear();
+ break;
+
+ case Editing::ImportSerializeFiles:
- case Editing::ImportDistinctChannels:
- ok = (import_sndfiles (to_import, mode, quality, pos, -1, -1, track, false, to_import.size()) == 0);
- break;
+ to_import.clear ();
+ to_import.push_back (*a);
- case Editing::ImportSerializeFiles:
- ok = (import_sndfiles (to_import, mode, quality, pos, 1, 1, track, false, to_import.size()) == 0);
- break;
+ ok = (import_sndfiles (to_import, disposition, mode, quality, pos, 1, 1, track, replace, instrument) == 0);
+ import_status.sources.clear();
+ break;
- case Editing::ImportMergeFiles:
- // Not entered, handled in earlier if() branch
- break;
+ case Editing::ImportMergeFiles:
+ // Not entered, handled in earlier if() branch
+ break;
+ }
}
}
- interthread_progress_window->hide_all ();
+ if (ok) {
+ _session->save_state ("");
+ }
+
+ import_status.all_done = true;
}
void
-Editor::do_embed (vector<ustring> paths, ImportDisposition chns, ImportMode mode, nframes64_t& pos)
+Editor::do_embed (vector<string> paths, ImportDisposition import_as, ImportMode mode, framepos_t& pos, ARDOUR::PluginInfoPtr instrument)
{
boost::shared_ptr<Track> track;
bool check_sample_rate = true;
bool ok = false;
- vector<ustring> to_embed;
+ 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<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
+ 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, instrument) < -1) {
goto out;
}
}
break;
case Editing::ImportDistinctChannels:
- for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
+ 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, instrument) < -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, instrument) < -1) {
goto out;
}
- break;
+ break;
case Editing::ImportSerializeFiles:
- for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
+ 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, instrument) < -1) {
goto out;
}
}
}
int
-Editor::import_sndfiles (vector<ustring> paths, ImportMode mode, SrcQuality quality, nframes64_t& pos,
- int target_regions, int target_tracks, boost::shared_ptr<Track> track, bool replace, uint32_t total)
+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,
+ ARDOUR::PluginInfoPtr instrument)
{
- interthread_progress_window->set_title (string_compose (_("Importing %1"), paths.front()));
- interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE);
- interthread_progress_bar.set_fraction (0.0f);
- interthread_cancel_label.set_text (_("Cancel Import"));
- current_interthread_info = &import_status;
-
import_status.paths = paths;
import_status.done = false;
import_status.cancel = false;
import_status.freeze = false;
- import_status.done = 0.0;
import_status.quality = quality;
import_status.replace_existing_source = replace;
- import_status.total = total;
import_status.mode = mode;
import_status.pos = pos;
import_status.target_regions = target_regions;
import_status.track = track;
import_status.replace = replace;
- interthread_progress_connection = Glib::signal_timeout().connect
- (sigc::bind (sigc::mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 500);
- track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
+ CursorContext::Handle cursor_ctx = CursorContext::create(*this, _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.
*/
gtk_main_iteration ();
}
- interthread_progress_window->hide ();
- import_status.done = true;
- interthread_progress_connection.disconnect ();
+ // wait for thread to terminate
+ while (!import_status.done) {
+ gtk_main_iteration ();
+ }
+
+ int result = -1;
if (!import_status.cancel && !import_status.sources.empty()) {
- if (add_sources (import_status.paths,
- import_status.sources,
- import_status.pos,
- import_status.mode,
- import_status.target_regions,
- import_status.target_tracks,
- import_status.track, false) == 0) {
- _session->save_state ("");
- }
+ result = add_sources (
+ import_status.paths,
+ import_status.sources,
+ import_status.pos,
+ disposition,
+ import_status.mode,
+ import_status.target_regions,
+ import_status.target_tracks,
+ track, false, instrument
+ );
/* update position from results */
pos = import_status.pos;
}
-
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
- return 0;
+ return result;
}
int
-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<Track>& track)
+Editor::embed_sndfiles (vector<string> paths,
+ bool multifile,
+ bool& check_sample_rate,
+ ImportDisposition disposition,
+ ImportMode mode,
+ framepos_t& pos,
+ int target_regions,
+ int target_tracks,
+ boost::shared_ptr<Track>& track,
+ ARDOUR::PluginInfoPtr instrument)
{
boost::shared_ptr<AudioFileSource> source;
SourceList sources;
string linked_path;
SoundFileInfo finfo;
- int ret = 0;
- Glib::ustring path_to_use;
- track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
- gdk_flush ();
+ CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
+ gdk_flush ();
- for (vector<Glib::ustring>::iterator p = paths.begin(); p != paths.end(); ++p) {
-
- ustring path = *p;
-
- if (Config->get_try_link_for_embed()) {
-
- /* lets see if we can link it into the session */
-
- sys::path tmp = _session->session_directory().sound_path() / Glib::path_get_basename(path);
- linked_path = tmp.to_string();
-
- path_to_use = linked_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;
- path_to_use = Glib::path_get_basename (path);
-
- } else {
+ for (vector<string>::iterator p = paths.begin(); p != paths.end(); ++p) {
- /* one possible reason is that its already linked */
-
- if (errno == EEXIST) {
- struct stat sb;
-
- if (stat (linked_path.c_str(), &sb) == 0) {
- if (sb.st_nlink > 1) { // its a hard link, assume its the one we want
- path = linked_path;
- path_to_use = Glib::path_get_basename (path);
- }
- }
- }
- }
- }
+ string path = *p;
+ string error_msg;
/* note that we temporarily truncated _id at the colon */
- string error_msg;
-
if (!AudioFileSource::get_soundfile_info (path, finfo, error_msg)) {
error << string_compose(_("Editor: cannot open file \"%1\", (%2)"), path, error_msg ) << endmsg;
- goto out;
+ return -3;
}
if (check_sample_rate && (finfo.samplerate != (int) _session->frame_rate())) {
choices.push_back (_("Embed all without questions"));
Gtkmm2ext::Choice rate_choice (
+ _("Sample rate"),
string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"),
short_path (path, 40)),
- choices, false);
+ choices, false
+ );
int resx = rate_choice.run ();
switch (resx) {
case 0: /* stop a multi-file import */
- ret = -2;
- goto out;
+ return -2;
case 1: /* don't embed this one */
- ret = -1;
- goto out;
+ return -1;
case 2: /* do it, and the rest without asking */
check_sample_rate = false;
break;
case 3: /* do it */
break;
default:
- ret = -2;
- goto out;
+ return -2;
}
} else {
choices.push_back (_("Cancel"));
choices.push_back (_("Embed it anyway"));
Gtkmm2ext::Choice rate_choice (
+ _("Sample rate"),
string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
- choices, false);
+ choices, false
+ );
int resx = rate_choice.run ();
switch (resx) {
case 0: /* don't import */
- ret = -1;
- goto out;
+ return -1;
case 1: /* do it */
break;
default:
- ret = -2;
- goto out;
+ return -2;
}
}
}
- track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
-
for (int n = 0; n < finfo.channels; ++n) {
+
try {
/* check if we have this thing embedded already */
boost::shared_ptr<Source> 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<AudioFileSource> (
- SourceFactory::createReadable (DataType::AUDIO, *_session,
- path_to_use, n,
+ SourceFactory::createExternal (DataType::AUDIO, *_session,
+ path, n,
(mode == ImportAsTapeTrack
? Source::Destructive
: Source::Flag (0)),
catch (failed_constructor& err) {
error << string_compose(_("could not open %1"), path) << endmsg;
- goto out;
+ return -3;
}
- ARDOUR_UI::instance()->flush_pending ();
+ gtk_main_iteration();
}
}
- if (sources.empty()) {
- goto out;
+ if (!sources.empty()) {
+ return add_sources (paths, sources, pos, disposition, mode, target_regions, target_tracks, track, true, instrument);
}
- ret = add_sources (paths, sources, pos, mode, target_regions, target_tracks, track, true);
-
- out:
- track_canvas->get_window()->set_cursor (*current_canvas_cursor);
- return ret;
+ return 0;
}
int
-Editor::add_sources (vector<Glib::ustring> paths, SourceList& sources, nframes64_t& pos, ImportMode mode,
- int target_regions, int target_tracks, boost::shared_ptr<Track>& track, bool /*add_channel_suffix*/)
+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*/,
+ ARDOUR::PluginInfoPtr instrument)
{
vector<boost::shared_ptr<Region> > regions;
- ustring region_name;
+ string region_name;
uint32_t input_chan = 0;
uint32_t output_chan = 0;
bool use_timestamp;
+ vector<string> track_names;
use_timestamp = (pos == -1);
- if (use_timestamp) {
- if (sources[0]->natural_position() != 0) {
- pos = sources[0]->natural_position();
- } else {
- pos = get_preferred_edit_position ();
- }
- }
-
// kludge (for MIDI we're abusing "channel" for "track" here)
- if (paths.front().rfind(".mid") != Glib::ustring::npos)
+ if (SMFSource::safe_midi_file_extension (paths.front())) {
target_regions = -1;
+ }
if (target_regions == 1) {
region_name = region_name_from_path (paths.front(), (sources.size() > 1), false);
- boost::shared_ptr<Region> r = RegionFactory::create (sources, 0, sources[0]->length(pos), region_name, 0,
- Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External));
+ /* we checked in import_sndfiles() that there were not too many */
+
+ while (RegionFactory::region_by_name (region_name)) {
+ region_name = bump_name_once (region_name, '.');
+ }
+
+ PropertyList plist;
+
+ plist.add (ARDOUR::Properties::start, 0);
+ plist.add (ARDOUR::Properties::length, sources[0]->length (pos));
+ plist.add (ARDOUR::Properties::name, region_name);
+ plist.add (ARDOUR::Properties::layer, 0);
+ plist.add (ARDOUR::Properties::whole_file, true);
+ plist.add (ARDOUR::Properties::external, true);
+
+ boost::shared_ptr<Region> r = RegionFactory::create (sources, plist);
if (use_timestamp && boost::dynamic_pointer_cast<AudioRegion>(r)) {
boost::dynamic_pointer_cast<AudioRegion>(r)->special_set_position(sources[0]->natural_position());
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) {
just_one.clear ();
just_one.push_back (*x);
- region_name = region_name_from_path ((*x)->path(), false, false, sources.size(), n);
+ boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource> (*x);
+
+ if (sources.size() > 1 && disposition == ImportDistinctChannels) {
+
+ /* generate a per-channel region name so that things work as
+ * intended
+ */
- boost::shared_ptr<Region> r = RegionFactory::create (just_one, 0, (*x)->length(pos), region_name, 0,
- Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External));
+ 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;
+
+ /* 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 ();
+ }
+
+ plist.add (ARDOUR::Properties::start, 0);
+ 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);
+ plist.add (ARDOUR::Properties::external, true);
+
+ boost::shared_ptr<Region> r = RegionFactory::create (just_one, plist);
if (use_timestamp && boost::dynamic_pointer_cast<AudioRegion>(r)) {
boost::dynamic_pointer_cast<AudioRegion>(r)->special_set_position((*x)->natural_position());
}
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<boost::shared_ptr<Region> >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) {
+ boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (*r);
+
+ if (use_timestamp) {
+ if (ar) {
+
+ /* get timestamp for this region */
+
+ const boost::shared_ptr<Source> s (ar->sources().front());
+ const boost::shared_ptr<AudioSource> as = boost::dynamic_pointer_cast<AudioSource> (s);
+
+ assert (as);
- finish_bringing_in_material (*r, input_chan, output_chan, pos, mode, track);
+ 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, track_names[n], instrument);
+
+ rlen = (*r)->length();
if (target_tracks != 1) {
track.reset ();
} else {
- pos += (*r)->length();
+ if (!use_timestamp || !ar) {
+ /* line each one up right after the other */
+ pos += (*r)->length();
+ }
}
}
+ 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, nframes64_t& pos,
- ImportMode mode, boost::shared_ptr<Track>& existing_track)
+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,
+ const string& new_track_name,
+ ARDOUR::PluginInfoPtr instrument)
{
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->diskstream()->playlist();
- boost::shared_ptr<Region> copy (RegionFactory::create (region));
- begin_reversible_command (_("insert file"));
- XMLNode &before = playlist->get_state();
+ boost::shared_ptr<Playlist> playlist = existing_track->playlist();
+ boost::shared_ptr<Region> copy (RegionFactory::create (region, region->properties()));
+ playlist->clear_changes ();
playlist->add_region (copy, pos);
- _session->add_command (new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
- commit_reversible_command ();
+ if (Config->get_edit_mode() == Ripple)
+ playlist->ripple (pos, copy->length(), copy);
+
+ _session->add_command (new StatefulDiffCommand (playlist));
break;
}
{
if (!existing_track) {
if (ar) {
- list<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (in_chans, out_chans, Normal, 0, 1));
+ list<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (in_chans, out_chans, 0, 1, string(), PresentationInfo::max_order, Normal));
if (at.empty()) {
return -1;
}
+ if (Config->get_strict_io ()) {
+ for (list<boost::shared_ptr<AudioTrack> >::iterator i = at.begin(); i != at.end(); ++i) {
+ (*i)->set_strict_io (true);
+ }
+ }
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),
+ instrument, (Plugin::PresetRecord*) 0,
+ (RouteGroup*) 0,
+ 1,
+ string(),
+ PresentationInfo::max_order));
if (mt.empty()) {
return -1;
}
+ if (Config->get_strict_io ()) {
+ for (list<boost::shared_ptr<MidiTrack> >::iterator i = mt.begin(); i != mt.end(); ++i) {
+ (*i)->set_strict_io (true);
+ }
+ }
+ // TODO set strict_io from preferences
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<Region> copy (RegionFactory::create (region));
- existing_track->diskstream()->playlist()->add_region (copy, pos);
+ boost::shared_ptr<Playlist> playlist = existing_track->playlist();
+ boost::shared_ptr<Region> 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<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (in_chans, out_chans, Destructive));
+ list<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (in_chans, out_chans, 0, 1, string(), PresentationInfo::max_order, Destructive));
if (!at.empty()) {
- boost::shared_ptr<Region> copy (RegionFactory::create (region));
- at.front()->set_name (basename_nosuffix (copy->name()));
- at.front()->diskstream()->playlist()->add_region (copy, pos);
+ boost::shared_ptr<Playlist> playlist = at.front()->playlist();
+ boost::shared_ptr<Region> copy (RegionFactory::create (region, true));
+ playlist->clear_changes ();
+ playlist->add_region (copy, pos);
+ _session->add_command (new StatefulDiffCommand (playlist));
+ }
+ if (Config->get_strict_io ()) {
+ for (list<boost::shared_ptr<AudioTrack> >::iterator i = at.begin(); i != at.end(); ++i) {
+ (*i)->set_strict_io (true);
+ }
}
break;
}
void *
Editor::import_thread ()
{
- _session->import_audiofiles (import_status);
- pthread_exit_pbd (0);
- /*NOTREACHED*/
+ _session->import_files (import_status);
return 0;
}
-
-gint
-Editor::import_progress_timeout (void */*arg*/)
-{
- bool reset = false;
-
- if (!interthread_progress_window->is_visible()) {
- interthread_progress_window->show_all ();
- reset = true;
- }
-
- interthread_progress_label.set_text (import_status.doing_what);
-
- if (import_status.freeze) {
- interthread_cancel_button.set_sensitive(false);
- } else {
- interthread_cancel_button.set_sensitive(true);
- }
-
- if (import_status.doing_what == "building peak files") {
- interthread_progress_bar.pulse ();
- return FALSE;
- } else {
- float val = import_status.progress;
- interthread_progress_bar.set_fraction (min (max (0.0f, val), 1.0f));
- }
-
- if (reset) {
-
- /* the window is now visible, speed up the updates */
-
- interthread_progress_connection.disconnect ();
- interthread_progress_connection = Glib::signal_timeout().connect
- (sigc::bind (sigc::mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 100);
- return false;
- } else {
- return !(import_status.done || import_status.cancel);
- }
-}
-
projects / ardour.git / blobdiff