diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-30 14:02:26 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-30 14:02:26 -0400 |
| commit | b691d4bf04b46059c09e144e34fc58504926ef06 (patch) | |
| tree | fca444144590883ef1b3b6b77da1c85104b51429 /libs/ardour/import.cc | |
| parent | 864ce8f0d1aaefdbf7cb582b9ed34d669e81c468 (diff) | |
fix up some confusion with filesources' _origin and _file_is_new members. if _origin is set, it means that the file is "external" to the session (aka "embedded") and for some purposes this is more significant than _file_is_new. rename SourceFactory::createReadable() to ::createExternal() to more clearly indicate its purpose; remove never-supplied "origin" argument from SourceFactor::createWritable(). Fixes problems caused by 864ce8f0
Diffstat (limited to 'libs/ardour/import.cc')
| -rw-r--r-- | libs/ardour/import.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index 07c7958ad7..047b46f553 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -214,8 +214,7 @@ map_existing_mono_sources (const vector<string>& new_paths, Session& /*sess*/, } static bool -create_mono_sources_for_writing (const string& origin, - const vector<string>& new_paths, +create_mono_sources_for_writing (const vector<string>& new_paths, Session& sess, uint samplerate, vector<boost::shared_ptr<Source> >& newfiles, framepos_t timeline_position) @@ -229,7 +228,6 @@ create_mono_sources_for_writing (const string& origin, source = SourceFactory::createWritable (type, sess, i->c_str(), - origin, false, // destructive samplerate); } @@ -527,7 +525,7 @@ Session::import_files (ImportStatus& status) fatal << "THIS IS NOT IMPLEMENTED YET, IT SHOULD NEVER GET CALLED!!! DYING!" << endmsg; status.cancel = !map_existing_mono_sources (new_paths, *this, frame_rate(), newfiles, this); } else { - status.cancel = !create_mono_sources_for_writing (*p, new_paths, *this, frame_rate(), newfiles, natural_position); + status.cancel = !create_mono_sources_for_writing (new_paths, *this, frame_rate(), newfiles, natural_position); } // copy on cancel/failure so that any files that were created will be removed below |