/*
- Copyright (C) 2000-2006 Paul Davis
+ Copyright (C) 2000-2006 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <sys/time.h>
#include <errno.h>
#include <unistd.h>
+#include <algorithm>
#include <sndfile.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/basename.h>
-#include <pbd/shortpath.h>
+#include "pbd/pthread_utils.h"
+#include "pbd/basename.h"
+#include "pbd/shortpath.h"
+#include "pbd/stateful_diff_command.h"
#include <gtkmm2ext/choice.h>
-#include <gtkmm2ext/window_title.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/region_factory.h>
-#include <ardour/source_factory.h>
-#include <ardour/session.h>
-#include <pbd/memento_command.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/region_factory.h"
+#include "ardour/source_factory.h"
+#include "ardour/session.h"
+#include "ardour/smf_source.h"
+#include "ardour/operations.h"
+#include "pbd/memento_command.h"
#include "ardour_ui.h"
#include "editor.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"
using namespace std;
using namespace ARDOUR;
using namespace PBD;
-using namespace sigc;
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 */
void
Editor::add_external_audio_action (ImportMode mode_hint)
{
- if (session == 0) {
- MessageDialog msg (0, _("You can't import or embed a file until you have a session loaded."));
+ if (_session == 0) {
+ MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded."));
msg.run ();
return;
}
if (sfbrowser == 0) {
- sfbrowser = new SoundFileOmega (*this, _("Add existing media"), session, 0, true, mode_hint);
+ sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), _session, 0, true, mode_hint);
} else {
sfbrowser->set_mode (mode_hint);
}
void
Editor::external_audio_dialog ()
{
- vector<Glib::ustring> paths;
+ vector<string> paths;
uint32_t track_cnt;
- if (session == 0) {
- MessageDialog msg (0, _("You can't import or embed a file until you have a session loaded."));
+ if (_session == 0) {
+ MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded."));
msg.run ();
return;
}
-
+
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()) {
}
if (sfbrowser == 0) {
- sfbrowser = new SoundFileOmega (*this, _("Add existing media"), session, track_cnt, true);
+ sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), _session, track_cnt, true);
} else {
sfbrowser->reset (track_cnt);
}
/* lets do it */
- paths = sfbrowser->get_paths ();
-
+ 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 ();
- nframes64_t where;
+ framepos_t where;
switch (pos) {
case ImportAtEditPoint:
where = playhead_cursor->current_frame;
break;
case ImportAtStart:
- where = session->current_start_frame();
+ where = _session->current_start_frame();
break;
}
} 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;
/**
{
string wave_name (Glib::path_get_basename(path));
- SourceMap all_sources = session->get_sources();
- bool wave_name_exists = false;
+ SourceMap all_sources = _session->get_sources();
+ 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
//message = string_compose(_("The session already contains a source file named %1. Do you want to update that file (and thus all regions using the file) or import this file as a new file?"),wave_name);
- message = string_compose(_("The session already contains a source file named %1. This file will be imported as a new file, please confirm."),wave_name);
+ message = string_compose (_("The session already contains a source file named %1. Do you want to import %1 as a new file, or skip it?"), wave_name);
} else {
- message = _("Lorem ipsum. Do you want to skidaddle?");
+ message = string_compose (_("The session already contains a source file named %1. Do you want to import %2 as a new source, or skip it?"), wave_name, wave_name);
}
- MessageDialog dialog(message, false,Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true);
+ MessageDialog dialog(message, false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true);
if (all_or_nothing) {
// disabled
dialog.add_button("Import", 1);
dialog.add_button("Cancel", 2);
}
-
-
+
//dialog.add_button("Skip all", 4); // All or rest?
dialog.show();
{
AudioTimeAxisView* atv;
TrackSelection::iterator x;
-
+
for (x = selection->tracks.begin(); nth > 0 && x != selection->tracks.end(); ++x) {
atv = dynamic_cast<AudioTimeAxisView*>(*x);
-
+
if (!atv) {
continue;
} else if (atv->is_audio_track()) {
--nth;
}
}
-
+
if (x == selection->tracks.end()) {
atv = dynamic_cast<AudioTimeAxisView*>(selection->tracks.back());
} else {
atv = dynamic_cast<AudioTimeAxisView*>(*x);
}
-
+
if (!atv || !atv->is_audio_track()) {
return boost::shared_ptr<AudioTrack>();
}
-
+
return atv->audio_track();
-}
+}
boost::shared_ptr<MidiTrack>
Editor::get_nth_selected_midi_track (int nth) const
{
MidiTimeAxisView* mtv;
TrackSelection::iterator x;
-
+
for (x = selection->tracks.begin(); nth > 0 && x != selection->tracks.end(); ++x) {
mtv = dynamic_cast<MidiTimeAxisView*>(*x);
-
+
if (!mtv) {
continue;
} else if (mtv->is_midi_track()) {
--nth;
}
}
-
+
if (x == selection->tracks.end()) {
mtv = dynamic_cast<MidiTimeAxisView*>(selection->tracks.back());
} else {
mtv = dynamic_cast<MidiTimeAxisView*>(*x);
}
-
+
if (!mtv || !mtv->is_midi_track()) {
return boost::shared_ptr<MidiTrack>();
}
-
+
return mtv->midi_track();
-}
+}
void
-Editor::do_import (vector<ustring> paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, nframes64_t& pos)
+Editor::do_import (vector<string> paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, framepos_t& pos)
{
boost::shared_ptr<Track> track;
- vector<ustring> to_import;
- bool ok = true;
+ 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) {
+
/* 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() && ok; ++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) {
- if (import_sndfiles (paths, mode, quality, pos, 1, 1, track, false)) {
- ok = false;
- }
+ if (cancel) {
+ ok = false;
+ } else {
+ ipw.show ();
+ ok = (import_sndfiles (paths, mode, quality, pos, 1, 1, track, false) == 0);
}
} else {
- bool replace = false;
- for (vector<ustring>::iterator a = paths.begin(); a != paths.end() && ok; ++a) {
+ bool replace = false;
- int check = check_whether_and_how_to_import(*a, true);
+ for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) {
- if (check == 2 ) {
- // skip
+ const int check = check_whether_and_how_to_import (*a, true);
+
+ switch (check) {
+ case 2:
+ // user said skip
continue;
+ case 0:
+ fatal << "Updating existing sources should be disabled!" << endmsg;
+ /* NOTREACHED*/
+ break;
+ case 1:
+ replace = false;
+ break;
+ default:
+ fatal << "Illegal return " << check << " from check_whether_and_how_to_import()!" << endmsg;
+ /* NOTREACHED*/
}
- if (check == 0) {
- fatal << "Updating existing sources should be disabled!" << endl;
- replace = true;
- } else if (check == 1) {
- replace = false;
+ /* have to reset this for every file we handle */
+
+ if (use_timestamp) {
+ pos = -1;
}
-
+ ipw.show ();
+
switch (chns) {
- case Editing::ImportDistinctFiles:
-
- 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, quality, pos, 1, -1, track, replace)) {
- ok = false;
- }
-
- break;
-
- case Editing::ImportDistinctChannels:
-
- to_import.clear ();
- to_import.push_back (*a);
-
- if (import_sndfiles (to_import, mode, quality, pos, -1, -1, track, replace)) {
- ok = false;
- }
-
- break;
-
- case Editing::ImportSerializeFiles:
-
- 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, quality, pos, 1, 1, track, replace)) {
- ok = false;
- }
+ 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, 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);
+ break;
+
+ case Editing::ImportSerializeFiles:
+
+ to_import.clear ();
+ to_import.push_back (*a);
- break;
+ ok = (import_sndfiles (to_import, mode, quality, pos, 1, 1, track, replace) == 0);
+ break;
- case Editing::ImportMergeFiles:
- // Not entered
- break;
+ case Editing::ImportMergeFiles:
+ // Not entered, handled in earlier if() branch
+ break;
}
}
-
- if (ok) {
- session->save_state ("");
- }
-
- interthread_progress_window->hide_all ();
}
-}
-bool
-Editor::idle_do_embed (vector<ustring> paths, ImportDisposition chns, ImportMode mode, nframes64_t& pos)
-{
- _do_embed (paths, chns, mode, pos);
- return false;
-}
+ if (ok) {
+ _session->save_state ("");
+ }
-void
-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, chns, mode, pos));
-#else
- _do_embed (paths, chns, mode, pos);
-#endif
+ 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 chns, ImportMode mode, framepos_t& pos)
{
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;
switch (chns) {
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) {
to_embed.clear ();
to_embed.push_back (*a);
}
}
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) {
to_embed.clear ();
to_embed.push_back (*a);
if (embed_sndfiles (paths, multi, check_sample_rate, mode, pos, 1, 1, track) < -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) {
to_embed.clear ();
to_embed.push_back (*a);
}
ok = true;
-
- out:
+
+ out:
if (ok) {
- session->save_state ("");
+ _session->save_state ("");
}
}
int
-Editor::import_sndfiles (vector<ustring> paths, ImportMode mode, SrcQuality quality, nframes64_t& pos,
+Editor::import_sndfiles (vector<string> paths, ImportMode mode, SrcQuality quality, framepos_t& pos,
int target_regions, int target_tracks, boost::shared_ptr<Track>& track, bool replace)
{
- WindowTitle title = string_compose (_("importing %1"), paths.front());
-
- interthread_progress_window->set_title (title.get_string());
- 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.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;
- interthread_progress_connection = Glib::signal_timeout().connect
- (bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 100);
-
- track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
- ARDOUR_UI::instance()->flush_pending ();
+ import_status.mode = mode;
+ import_status.pos = pos;
+ import_status.target_tracks = target_tracks;
+ import_status.target_regions = target_regions;
+ import_status.track = track;
+ import_status.replace = replace;
+
+ set_canvas_cursor (_cursors->wait);
+ gdk_flush ();
/* start import thread for this spec. this will ultimately call Session::import_audiofiles()
- and if successful will add the file(s) as a region to the session region list.
+ 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.
*/
-
- pthread_create_and_store ("import", &import_status.thread, 0, _import_thread, this);
+
+ pthread_create_and_store ("import", &import_status.thread, _import_thread, this);
pthread_detach (import_status.thread);
-
- while (!(import_status.done || import_status.cancel)) {
+
+ while (!import_status.done && !import_status.cancel) {
gtk_main_iteration ();
}
- interthread_progress_window->hide ();
-
import_status.done = true;
- interthread_progress_connection.disconnect ();
-
- /* import thread finished - see if we should build a new track */
- boost::shared_ptr<AudioRegion> r;
-
- if (import_status.cancel || import_status.sources.empty()) {
- goto out;
- }
+ int result = -1;
+
+ if (!import_status.cancel && !import_status.sources.empty()) {
+ result = add_sources (
+ import_status.paths,
+ import_status.sources,
+ import_status.pos,
+ import_status.mode,
+ import_status.target_regions,
+ import_status.target_tracks,
+ track, false
+ );
- if (add_sources (paths, import_status.sources, pos, mode, target_regions, target_tracks, track, false) == 0) {
- session->save_state ("");
+ /* update position from results */
+
+ pos = import_status.pos;
}
- out:
- track_canvas.get_window()->set_cursor (*current_canvas_cursor);
- return 0;
+ set_canvas_cursor (current_canvas_cursor);
+ 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,
+Editor::embed_sndfiles (vector<string> paths, bool multifile,
+ bool& check_sample_rate, ImportMode mode, framepos_t& pos, int target_regions, int target_tracks,
boost::shared_ptr<Track>& track)
{
boost::shared_ptr<AudioFileSource> source;
SoundFileInfo finfo;
int ret = 0;
- track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
- ARDOUR_UI::instance()->flush_pending ();
-
- for (vector<Glib::ustring>::iterator p = paths.begin(); p != paths.end(); ++p) {
-
- ustring path = *p;
-
- /* 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();
-
- 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;
-
- } else {
+ set_canvas_cursor (_cursors->wait);
+ gdk_flush ();
- /* one possible reason is that its already linked */
+ for (vector<string>::iterator p = paths.begin(); p != paths.end(); ++p) {
- if (errno == EEXIST) {
- struct stat sb;
+ string path = *p;
+ string error_msg;
- 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;
- }
- }
- }
- }
-
/* 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;
}
-
- if (check_sample_rate && (finfo.samplerate != (int) session->frame_rate())) {
+
+ if (check_sample_rate && (finfo.samplerate != (int) _session->frame_rate())) {
vector<string> choices;
-
+
if (multifile) {
choices.push_back (_("Cancel entire import"));
choices.push_back (_("Don't embed it"));
choices.push_back (_("Embed all without questions"));
-
+
Gtkmm2ext::Choice rate_choice (
- string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"),
+ _("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;
} 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;
}
}
}
-
- track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
+
+ set_canvas_cursor (_cursors->wait);
for (int n = 0; n < finfo.channels; ++n) {
try {
boost::shared_ptr<Source> s;
- if ((s = session->source_by_path_and_channel (path, n)) == 0) {
- source = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable
- (DataType::AUDIO, *session, path, n,
- (mode == ImportAsTapeTrack ?
- AudioFileSource::Destructive :
- AudioFileSource::Flag (0)),
- true, true));
+ if ((s = _session->source_by_path_and_channel (path, n)) == 0) {
+
+ source = boost::dynamic_pointer_cast<AudioFileSource> (
+ SourceFactory::createReadable (DataType::AUDIO, *_session,
+ path, n,
+ (mode == ImportAsTapeTrack
+ ? Source::Destructive
+ : Source::Flag (0)),
+ true, true));
} else {
source = boost::dynamic_pointer_cast<AudioFileSource> (s);
}
sources.push_back(source);
- }
-
+ }
+
catch (failed_constructor& err) {
error << string_compose(_("could not open %1"), path) << endmsg;
goto out;
}
-
+
ARDOUR_UI::instance()->flush_pending ();
}
}
ret = add_sources (paths, sources, pos, mode, target_regions, target_tracks, track, true);
out:
- track_canvas.get_window()->set_cursor (*current_canvas_cursor);
+ set_canvas_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<Track>& track, bool add_channel_suffix)
+Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos, ImportMode mode,
+ int target_regions, int target_tracks, boost::shared_ptr<Track>& track, bool /*add_channel_suffix*/)
{
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;
- if (pos == -1) { // "use timestamp"
- if (sources[0]->natural_position() != 0) {
- pos = sources[0]->natural_position();
- } else {
- pos = get_preferred_edit_position ();
- }
- }
+ use_timestamp = (pos == -1);
- cout << "TARGET REGIONS: " << target_regions << endl;
+ // kludge (for MIDI we're abusing "channel" for "track" here)
+ if (SMFSource::safe_midi_file_extension (paths.front())) {
+ target_regions = -1;
+ }
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), false);
+
+ /* 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;
- regions.push_back (RegionFactory::create (sources, 0, sources[0]->length(), region_name, 0,
- Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)));
-
- } else if (target_regions == -1) {
+ 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);
+
+
+ } else if (target_regions == -1 || target_regions > 1) {
/* take each source and create a region for each one */
just_one.clear ();
just_one.push_back (*x);
+
+ region_name = region_name_from_path ((*x)->path(), false, false, sources.size(), n);
+
+ PropertyList plist;
- region_name = region_name_from_path ((*x)->path(), false, true, sources.size(), n);
+ plist.add (ARDOUR::Properties::start, 0);
+ plist.add (ARDOUR::Properties::length, (*x)->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);
- cout << "REGION NAME: " << region_name << endl;
- cout << "SOURCE LENGTH: " << (*x)->length() << endl;
+ boost::shared_ptr<Region> r = RegionFactory::create (just_one, plist);
- regions.push_back (RegionFactory::create (just_one, 0, (*x)->length(), region_name, 0,
- Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)));
+ if (use_timestamp && boost::dynamic_pointer_cast<AudioRegion>(r)) {
+ boost::dynamic_pointer_cast<AudioRegion>(r)->special_set_position((*x)->natural_position());
+ }
+ regions.push_back (r);
}
}
}
if (Config->get_output_auto_connect() & AutoConnectMaster) {
- output_chan = (session->master_out() ? session->master_out()->n_inputs().n_audio() : input_chan);
+ output_chan = (_session->master_out() ? _session->master_out()->n_inputs().n_audio() : input_chan);
} else {
output_chan = input_chan;
}
int n = 0;
-
- for (vector<boost::shared_ptr<Region> >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) {
+ framepos_t rlen = 0;
+
+ 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);
+
+ 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);
+ rlen = (*r)->length();
+
if (target_tracks != 1) {
track.reset ();
- } else {
- pos += (*r)->length();
- }
+ } else {
+ if (!use_timestamp || !ar) {
+ /* line each one up right after the other */
+ pos += (*r)->length();
+ }
+ }
}
/* setup peak file building in another thread */
return 0;
}
-
+
int
-Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t in_chans, uint32_t out_chans, nframes64_t& pos,
+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)
{
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(region);
case ImportAsRegion:
/* relax, its been done */
break;
-
+
case ImportToTrack:
{
if (!existing_track) {
}
}
- 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()));
+ begin_reversible_command (Operations::insert_file);
+ playlist->clear_changes ();
playlist->add_region (copy, pos);
- session->add_command (new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
+ _session->add_command (new StatefulDiffCommand (playlist));
commit_reversible_command ();
break;
}
case ImportAsTrack:
- {
+ {
if (!existing_track) {
if (ar) {
- list<boost::shared_ptr<AudioTrack> > at (session->new_audio_track (in_chans, out_chans, Normal, 1));
+ list<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (in_chans, out_chans, Normal, 0, 1));
if (at.empty()) {
return -1;
existing_track = at.front();
} else if (mr) {
- list<boost::shared_ptr<MidiTrack> > mt (session->new_midi_track (Normal, 1));
+ list<boost::shared_ptr<MidiTrack> > mt (_session->new_midi_track (Normal, 0, 1));
if (mt.empty()) {
return -1;
existing_track = mt.front();
}
-
+
existing_track->set_name (region->name());
}
+
+ boost::shared_ptr<Playlist> playlist = existing_track->playlist();
boost::shared_ptr<Region> copy (RegionFactory::create (region));
- existing_track->diskstream()->playlist()->add_region (copy, pos);
+ begin_reversible_command (Operations::insert_file);
+ playlist->clear_changes ();
+ playlist->add_region (copy, pos);
+ _session->add_command (new StatefulDiffCommand (playlist));
+ commit_reversible_command ();
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, Destructive));
if (!at.empty()) {
+ boost::shared_ptr<Playlist> playlist = at.front()->playlist();
boost::shared_ptr<Region> copy (RegionFactory::create (region));
- at.front()->set_name (basename_nosuffix (copy->name()));
- at.front()->diskstream()->playlist()->add_region (copy, pos);
+ begin_reversible_command (Operations::insert_file);
+ playlist->clear_changes ();
+ playlist->add_region (copy, pos);
+ _session->add_command (new StatefulDiffCommand (playlist));
+ commit_reversible_command ();
}
break;
}
void *
Editor::_import_thread (void *arg)
{
- PBD::ThreadCreated (pthread_self(), X_("Import"));
+ SessionEvent::create_per_thread_pool ("import events", 64);
Editor *ed = (Editor *) arg;
return ed->import_thread ();
void *
Editor::import_thread ()
{
- session->import_audiofiles (import_status);
+ _session->import_audiofiles (import_status);
pthread_exit_pbd (0);
/*NOTREACHED*/
return 0;
}
-
-gint
-Editor::import_progress_timeout (void *arg)
-{
- 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 {
- interthread_progress_bar.set_fraction (import_status.progress);
- }
-
- return !(import_status.done || import_status.cancel);
-}
-
projects / ardour.git / blobdiff