ardour/livetrax
13
0
Fork 0
Code

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.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7928 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-10-27 21:21:34 +00:00
parent d31a63c685
commit 67b4433b0c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/audiofilesource.cc
View File

@ -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

2
libs/ardour/session.cc
View File

@ -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();
}