Fixes case where audiofiles used wrong peakfiles

4 files changed, 5 insertions, 5 deletions

diff --git a/libs/ardour/ardour/audio_playlist_source.h b/libs/ardour/ardour/audio_playlist_source.h
index ad278bad0d..85f29bd79a 100644
--- a/libs/ardour/ardour/audio_playlist_source.h
+++ b/libs/ardour/ardour/audio_playlist_source.h
@@ -37,7 +37,7 @@ public:
 	virtual ~AudioPlaylistSource ();
 
 	bool empty() const;
-	std::string generate_peak_path (const std::string& audio_path);
+	std::string construct_peak_filepath (const std::string& audio_path) const;
 	uint32_t   n_channels() const;
 	bool clamped_at_unity () const { return false; }
 
diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index 45b465c27f..da4f9aaea5 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -39,7 +39,7 @@ class LIBARDOUR_API AudioFileSource : public AudioSource, public FileSource {
 public:
 	virtual ~AudioFileSource ();
 
-	std::string generate_peak_path (const std::string& audio_path);
+	std::string construct_peak_filepath (const std::string& audio_filepath) const;
 	std::string find_broken_peakfile (const std::string& missing_peak_path,
 	                                  const std::string& audio_path);
 
diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h
index 6503aa7f73..4c6463e5b3 100644
--- a/libs/ardour/ardour/audiosource.h
+++ b/libs/ardour/ardour/audiosource.h
@@ -136,9 +136,9 @@ class LIBARDOUR_API AudioSource : virtual public Source,
 
 	virtual framecnt_t read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const = 0;
 	virtual framecnt_t write_unlocked (Sample *dst, framecnt_t cnt) = 0;
-	virtual std::string generate_peak_path(const std::string& audio_path) = 0;
+	virtual std::string construct_peak_filepath(const std::string& audio_filepath) const = 0;
 	virtual std::string find_broken_peakfile (std::string /* missing_peak_path */,
-	                                          std::string audio_path) { return generate_peak_path (audio_path); }
+	                                          std::string audio_path) { return construct_peak_filepath (audio_path); }
 
 	virtual int read_peaks_with_fpp (PeakData *peaks,
 					 framecnt_t npeaks, framepos_t start, framecnt_t cnt,
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 1ab53606ee..2e223beba7 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -198,7 +198,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
 	std::string plugins_dir () const;     ///< Plugin state
 	std::string externals_dir () const;   ///< Links to external files
 
-	std::string peak_path (const std::string&) const;
+	std::string construct_peak_filepath (const std::string&) const;
 
 	bool audio_source_name_is_unique (const std::string& name);
 	std::string format_audio_source_name (const std::string& legalized_base, uint32_t nchan, uint32_t chan, bool destructive, bool take_required, uint32_t cnt, bool related_exists);