summaryrefslogtreecommitdiff
path: root/libs/ardour/audiofilesource.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-09-10 16:39:35 +0200
committerRobin Gareus <robin@gareus.org>2015-09-10 16:47:26 +0200
commita86aa9e5bc4d2520087310caa4afb3508480b0d7 (patch)
tree6106ebc5a7c623e60c7b8b7a9791eaa1a985dd13 /libs/ardour/audiofilesource.cc
parentb3e84956627f09c679021449bacbab6d2d601139 (diff)
use FileSource::within_session() for peak-files
Diffstat (limited to 'libs/ardour/audiofilesource.cc')
-rw-r--r--libs/ardour/audiofilesource.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 0c921dae8d..ed189152e5 100644
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -164,17 +164,17 @@ AudioFileSource::init (const string& pathstr, bool must_exist)
}
string
-AudioFileSource::construct_peak_filepath (const string& audio_path, bool oldformat) const
+AudioFileSource::construct_peak_filepath (const string& audio_path, const bool in_session, const bool old_peak_name) const
{
string base;
- if (oldformat) {
+ if (old_peak_name) {
base = audio_path.substr (0, audio_path.find_last_of ('.'));
} else {
base = audio_path;
}
base += '%';
base += (char) ('A' + _channel);
- return _session.construct_peak_filepath (base, oldformat);
+ return _session.construct_peak_filepath (base, in_session, old_peak_name);
}
bool
@@ -270,7 +270,7 @@ AudioFileSource::setup_peakfile ()
return 0;
}
if (!(_flags & NoPeakFile)) {
- return initialize_peakfile (_path);
+ return initialize_peakfile (_path, within_session());
} else {
return 0;
}