ardour/livetrax
13
0
Fork 0
Code

when merging external source files into session folder, if a collision occurs, use the original file suffix in conjunction with md5 hash

Browse Source
This commit is contained in:
Paul Davis 2014-07-08 12:25:36 -04:00
parent 66684c6690
commit b7f918bdb7
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/ardour/session.cc
View File

@ -36,17 +36,17 @@
#include <boost/algorithm/string/erase.hpp>
#include "pbd/basename.h"
#include "pbd/boost_debug.h"
#include "pbd/convert.h"
#include "pbd/convert.h"
#include "pbd/error.h"
#include "pbd/boost_debug.h"
#include "pbd/stl_delete.h"
#include "pbd/basename.h"
#include "pbd/stacktrace.h"
#include "pbd/file_utils.h"
#include "pbd/convert.h"
#include "pbd/md5.h"
#include "pbd/unwind.h"
#include "pbd/search_path.h"
#include "pbd/stacktrace.h"
#include "pbd/stl_delete.h"
#include "pbd/unwind.h"
#include "ardour/amp.h"
#include "ardour/analyser.h"
@ -3481,8 +3481,13 @@ Session::new_audio_source_path_for_embedded (const std::string& path)
md5.digestString (path.c_str());
md5.writeToString ();
base = md5.digestChars;
string ext = get_suffix (path);
/* XXX base needs suffix from path */
if (!ext.empty()) {
base += '.';
base += ext;
}
newpath = Glib::build_filename (sdir.sound_path(), base);