Use const reference and renames variable

4 files changed, 16 insertions, 17 deletions

diff --git a/libs/ardour/ardour/audio_playlist_source.h b/libs/ardour/ardour/audio_playlist_source.h
index 6a586fc30d..ad278bad0d 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 peak_path (std::string audio_path);
+	std::string generate_peak_path (const std::string& audio_path);
 	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 9e63f4c81d..45b465c27f 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -39,13 +39,13 @@ class LIBARDOUR_API AudioFileSource : public AudioSource, public FileSource {
 public:
 	virtual ~AudioFileSource ();
 
-	std::string peak_path (std::string audio_path);
-	std::string find_broken_peakfile (std::string missing_peak_path,
-	                                  std::string audio_path);
+	std::string generate_peak_path (const std::string& audio_path);
+	std::string find_broken_peakfile (const std::string& missing_peak_path,
+	                                  const std::string& audio_path);
 
-	static void set_peak_dir (std::string dir) { peak_dir = dir; }
+	static void set_peak_dir (const std::string& dir) { peak_dir = dir; }
 
-	static bool get_soundfile_info (std::string path, SoundFileInfo& _info, std::string& error);
+	static bool get_soundfile_info (const std::string& path, SoundFileInfo& _info, std::string& error);
 
 	bool safe_file_extension (const std::string& path) const {
 		return safe_audio_file_extension(path);
@@ -119,8 +119,8 @@ protected:
 	static framecnt_t header_position_offset;
 
   private:
-	std::string old_peak_path (std::string audio_path);
-	std::string broken_peak_path (std::string audio_path);
+	std::string old_peak_path (const std::string& audio_path);
+	std::string broken_peak_path (const std::string& audio_path);
 };
 
 } // namespace ARDOUR
diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h
index c02310ea28..6503aa7f73 100644
--- a/libs/ardour/ardour/audiosource.h
+++ b/libs/ardour/ardour/audiosource.h
@@ -43,7 +43,7 @@ class LIBARDOUR_API AudioSource : virtual public Source,
 		public boost::enable_shared_from_this<ARDOUR::AudioSource>
 {
   public:
-	AudioSource (Session&, std::string name);
+	AudioSource (Session&, const std::string& name);
 	AudioSource (Session&, const XMLNode&);
 	virtual ~AudioSource ();
 
@@ -115,18 +115,18 @@ class LIBARDOUR_API AudioSource : virtual public Source,
 	   thread, or a lock around calls that use them.
 	*/
 
-        static std::vector<boost::shared_array<Sample> > _mixdown_buffers;
+	static std::vector<boost::shared_array<Sample> > _mixdown_buffers;
 	static std::vector<boost::shared_array<gain_t> > _gain_buffers;
-        static Glib::Threads::Mutex    _level_buffer_lock;
+	static Glib::Threads::Mutex    _level_buffer_lock;
 
 	static void ensure_buffers_for_level (uint32_t, framecnt_t);
 	static void ensure_buffers_for_level_locked (uint32_t, framecnt_t);
 
 	framecnt_t           _length;
-	std::string         peakpath;
+	std::string         _peakpath;
 	std::string        _captured_for;
 
-	int initialize_peakfile (std::string path);
+	int initialize_peakfile (const std::string& path);
 	int build_peaks_from_scratch ();
 	int compute_and_write_peaks (Sample* buf, framecnt_t first_frame, framecnt_t cnt,
 	bool force, bool intermediate_peaks_ready_signal);
@@ -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 peak_path(std::string audio_path) = 0;
+	virtual std::string generate_peak_path(const std::string& audio_path) = 0;
 	virtual std::string find_broken_peakfile (std::string /* missing_peak_path */,
-	                                          std::string audio_path) { return peak_path (audio_path); }
+	                                          std::string audio_path) { return generate_peak_path (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 f5ff34e72d..1ab53606ee 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -198,9 +198,8 @@ 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 (std::string) const;
+	std::string peak_path (const std::string&) const;
 
-	std::string peak_path_from_audio_path (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);
 	std::string new_audio_source_path_for_embedded (const std::string& existing_path);