diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-10-27 21:21:34 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-10-27 21:21:34 +0000 |
| commit | 67b4433b0c8b83ca03dbc517c71e85b9ab619a0f (patch) | |
| tree | d71feec28b0d1fe73ce461da55936892820fc615 /libs | |
| parent | d31a63c68592d8a54d9a728c787c17885677151f (diff) | |
Don't strip suffixes twice from peakfile names, otherwise source names like fred.jim.wav and fred.sheila.wav end up trying to use the same peakfile name.
git-svn-id: svn://localhost/ardour2/branches/3.0@7928 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/audiofilesource.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc index 30f8f84a5b..9f24814d49 100644 --- a/libs/ardour/audiofilesource.cc +++ b/libs/ardour/audiofilesource.cc @@ -201,7 +201,7 @@ AudioFileSource::find_broken_peakfile (string peak_path, string audio_path) string AudioFileSource::broken_peak_path (string audio_path) { - return _session.peak_path (audio_path); + return _session.peak_path (basename_nosuffix (audio_path)); } string diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 935267f1da..2392d45ca1 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -2874,7 +2874,7 @@ string Session::peak_path (string base) const { sys::path peakfile_path(_session_dir->peak_path()); - peakfile_path /= basename_nosuffix (base) + peakfile_suffix; + peakfile_path /= base + peakfile_suffix; return peakfile_path.to_string(); } |