From b691d4bf04b46059c09e144e34fc58504926ef06 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 30 Mar 2013 14:02:26 -0400 Subject: 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 --- libs/ardour/audiofilesource.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libs/ardour/audiofilesource.cc') 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; } -- cgit v1.2.3