ardour/livetrax
13
0
Fork 0
Code

if a filesource is supposed to be new, don't waste time looking for it. if it has its _origin member set, search for that, not its name (affects embedded files)

Browse Source
This commit is contained in:
Paul Davis 2013-03-30 10:06:08 -04:00
parent 91a2798001
commit 864ce8f0d1
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/ardour/file_source.cc
View File

@ -111,15 +111,26 @@ FileSource::init (const string& pathstr, bool must_exist)
{ {
_timeline_position = 0; _timeline_position = 0;
if (!_file_is_new) {
if (Stateful::loading_state_version < 3000) { if (Stateful::loading_state_version < 3000) {
if (!find_2X (_session, _type, pathstr, must_exist, _file_is_new, _channel, _path)) { if (!find_2X (_session, _type, pathstr, must_exist, _file_is_new, _channel, _path)) {
throw MissingSource (pathstr, _type); throw MissingSource (pathstr, _type);
} }
} else { } else {
if (!find (_session, _type, pathstr, must_exist, _file_is_new, _channel, _path)) { string look_for;
if (!_origin.empty()) {
look_for = _origin;
} else {
look_for = pathstr;
}
if (!find (_session, _type, look_for, must_exist, _file_is_new, _channel, _path)) {
throw MissingSource (pathstr, _type); throw MissingSource (pathstr, _type);
} }
} }
}
set_within_session_from_path (_path); set_within_session_from_path (_path);