diff options
| author | Mathias Buhr <napcode@apparatus.de> | 2015-09-03 10:05:36 +0200 |
|---|---|---|
| committer | Mathias Buhr <napcode@apparatus.de> | 2015-09-03 10:05:36 +0200 |
| commit | cfb10eba35a60d975ef45512e1a9432c90f9d317 (patch) | |
| tree | ecf6ec834c65281dac29168b2a83593f768a80f1 /libs | |
| parent | 624f76b229b8e71f9c57aa60da1ac2046b0578cd (diff) | |
Review changes
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/audiosource.h | 4 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h index 4c6463e5b3..40ff27ceb5 100644 --- a/libs/ardour/ardour/audiosource.h +++ b/libs/ardour/ardour/audiosource.h @@ -137,8 +137,8 @@ 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 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 construct_peak_filepath (audio_path); } + virtual std::string find_broken_peakfile (const std::string& /* missing_peak_path */, + const 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/session.cc b/libs/ardour/session.cc index d382077827..e1a41e8db7 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -4412,17 +4412,9 @@ Session::construct_peak_filepath (const string& filepath) const string::size_type suffix = filename.find_last_of ('.'); - std::string filename_unsuffixed; - if (suffix != string::npos) { - filename_unsuffixed = filename.substr (0, suffix); - } else { - warning << string_compose (_("Odd audio file path: %1"), filepath) << endmsg; - filename_unsuffixed = filename; - } - - std::string checksum = "_" + Glib::Checksum::compute_checksum(Glib::Checksum::CHECKSUM_MD5, path + G_DIR_SEPARATOR + filename); + std::string checksum = Glib::Checksum::compute_checksum(Glib::Checksum::CHECKSUM_SHA1, path + G_DIR_SEPARATOR + filename); - return Glib::build_filename (_session_dir->peak_path(), filename_unsuffixed + checksum + peakfile_suffix); + return Glib::build_filename (_session_dir->peak_path(), checksum + peakfile_suffix); } string |