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/audiofilesource.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/audiofilesource.cc')
| -rw-r--r-- | libs/ardour/audiofilesource.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc index 2486d45ca1..e7d69d2258 100644 --- a/libs/ardour/audiofilesource.cc +++ b/libs/ardour/audiofilesource.cc @@ -95,8 +95,6 @@ AudioFileSource::AudioFileSource (Session& s, const string& path, Source::Flag f /* note that external files have their own path as "origin" */ , FileSource (s, DataType::AUDIO, path, path, flags) { - /* note that origin remains empty */ - if (init (_path, true)) { throw failed_constructor (); } @@ -322,7 +320,7 @@ int AudioFileSource::setup_peakfile () { if (!(_flags & NoPeakFile)) { - return initialize_peakfile (_file_is_new, _path); + return initialize_peakfile (_origin.empty(), _path); } else { return 0; } |