diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-30 13:16:38 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-30 13:16:38 +0000 |
| commit | acdc88f279760443dc7397290e9c4752af5b23c9 (patch) | |
| tree | 014adddabb815ab9d906f3bda1a2b2c78128e0ca /libs/ardour/import.cc | |
| parent | 395efbc32d02fda70df50079bedee35c355b3b37 (diff) | |
attempt to remove confusion and errors caused by unclear semantics of _is_embedded for FileSources; member renamed _within_session, and is now ALWAYS determined by the _path of the FileSource, never by the creator
git-svn-id: svn://localhost/ardour2/branches/3.0@6213 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/import.cc')
| -rw-r--r-- | libs/ardour/import.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index e2f52fe28f..c980c49c02 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -224,8 +224,9 @@ create_mono_sources_for_writing (const vector<string>& new_paths, Session& sess, const DataType type = ((*i).rfind(".mid") != string::npos) ? DataType::MIDI : DataType::AUDIO; + source = SourceFactory::createWritable (type, sess, - i->c_str(), true, + i->c_str(), false, // destructive samplerate); } @@ -435,7 +436,7 @@ Session::import_audiofiles (ImportStatus& status) nframes64_t natural_position = source ? source->natural_position() : 0; if (status.replace_existing_source) { - fatal << "THIS IS NOT IMPLEMENTED YET, IT SHOULD NEVER GET CALLED!!! DYING!" << endl; + 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 (new_paths, *this, frame_rate(), newfiles, natural_position); |