string linked_path;
SoundFileInfo finfo;
int ret = 0;
- string path_to_use;
set_canvas_cursor (wait_cursor);
gdk_flush ();
for (vector<string>::iterator p = paths.begin(); p != paths.end(); ++p) {
string 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 {
-
- /* 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 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;
source = boost::dynamic_pointer_cast<AudioFileSource> (
SourceFactory::createReadable (DataType::AUDIO, *_session,
- path_to_use, n,
+ path, n,
(mode == ImportAsTapeTrack
? Source::Destructive
: Source::Flag (0)),
set_within_session_from_path (pathstr);
- if (_within_session) {
- _name = Glib::path_get_basename (_name);
- }
+ if (!within_session()) {
+ _session.ensure_search_path_includes (Glib::path_get_dirname (pathstr), _type);
+ }
+
+ _name = Glib::path_get_basename (pathstr);
if (_file_is_new && must_exist) {
return -1;
FileSource::find (Session& s, DataType type, const string& path, bool must_exist,
bool& isnew, uint16_t& chan, string& found_path)
{
- string search_path = s.source_search_path (type);
-
- string pathstr = path;
bool ret = false;
-
- cerr << "Searching along " << search_path << endl;
+ string keeppath;
isnew = false;
-
- vector<string> dirs;
- vector<string> hits;
- int cnt;
- string fullpath;
- string keeppath;
-
- if (search_path.length() == 0) {
- error << _("FileSource: search path not set") << endmsg;
- goto out;
- }
-
- split (search_path, dirs, ':');
-
- cnt = 0;
- hits.clear ();
-
- for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
-
- cerr << "Searching in " << *i << " for " << pathstr << endl;
-
- fullpath = Glib::build_filename (*i, pathstr);
-
- if (Glib::file_test (fullpath, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
- keeppath = fullpath;
- hits.push_back (fullpath);
- ++cnt;
- }
- }
- if (cnt > 1) {
-
- int which = FileSource::AmbiguousFileName (pathstr, search_path, hits).get_value_or (-1);
+ if (!Glib::path_is_absolute (path)) {
+ vector<string> dirs;
+ vector<string> hits;
+ int cnt;
+ string fullpath;
- if (which < 0) {
+ string search_path = s.source_search_path (type);
+
+ if (search_path.length() == 0) {
+ error << _("FileSource: search path not set") << endmsg;
goto out;
- } else {
- keeppath = hits[which];
}
+
+ split (search_path, dirs, ':');
- } else if (cnt == 0) {
+ cnt = 0;
+ hits.clear ();
- if (must_exist) {
- error << string_compose(
- _("Filesource: cannot find required file (%1): while searching %2"),
- pathstr, search_path) << endmsg;
- goto out;
- } else {
- isnew = true;
+ for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
+
+ fullpath = Glib::build_filename (*i, path);
+
+ if (Glib::file_test (fullpath, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
+ keeppath = fullpath;
+ hits.push_back (fullpath);
+ ++cnt;
+ }
}
+
+ if (cnt > 1) {
+
+ int which = FileSource::AmbiguousFileName (path, search_path, hits).get_value_or (-1);
+
+ if (which < 0) {
+ goto out;
+ } else {
+ keeppath = hits[which];
+ }
+
+ } else if (cnt == 0) {
+
+ if (must_exist) {
+ error << string_compose(
+ _("Filesource: cannot find required file (%1): while searching %2"),
+ path, search_path) << endmsg;
+ goto out;
+ } else {
+ isnew = true;
+ }
+ }
+ } else {
+ keeppath = path;
}
/* Current find() is unable to parse relative path names to yet non-existant
if (must_exist) {
error << "FileSource::find(), keeppath = \"\", but the file must exist" << endl;
} else {
- keeppath = pathstr;
+ keeppath = path;
}
}
return search_path;
}
+void
+Session::ensure_search_path_includes (const string& path, DataType type)
+{
+ string search_path;
+ vector<string> dirs;
+
+ switch (type) {
+ case DataType::AUDIO:
+ search_path = config.get_audio_search_path ();
+ break;
+ case DataType::MIDI:
+ search_path = config.get_midi_search_path ();
+ break;
+ }
+
+ split (search_path, dirs, ':');
+
+ for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
+ if (*i == path) {
+ return;
+ }
+ }
+
+ if (!search_path.empty()) {
+ search_path += ':';
+ }
+
+ search_path += path;
+
+ switch (type) {
+ case DataType::AUDIO:
+ config.set_audio_search_path (search_path);
+ break;
+ case DataType::MIDI:
+ config.set_midi_search_path (search_path);
+ break;
+ }
+}
projects / ardour.git / commitdiff