ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

do not add 2.X search path if its already present in the search path 

git-svn-id: svn://localhost/ardour2/branches/3.0@13503 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-11-14 21:54:04 +00:00
parent 7bdda0e44c
commit 8cfd91ac46
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/ardour/session.cc
View File

@ -4385,7 +4385,7 @@ Session::source_search_path (DataType type) const
if (session_dirs.size() == 1) {
switch (type) {
case DataType::AUDIO:
s.push_back ( _session_dir->sound_path());
s.push_back (_session_dir->sound_path());
break;
case DataType::MIDI:
s.push_back (_session_dir->midi_path());
@ -4408,7 +4408,9 @@ Session::source_search_path (DataType type) const
if (type == DataType::AUDIO) {
const string sound_path_2X = _session_dir->sound_path_2X();
if (Glib::file_test (sound_path_2X, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
s.push_back (sound_path_2X);
if (find (s.begin(), s.end(), sound_path_2X) == s.end()) {
s.push_back (sound_path_2X);
}
}
}
@ -4427,16 +4429,7 @@ Session::source_search_path (DataType type) const
}
for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
vector<string>::iterator si;
for (si = s.begin(); si != s.end(); ++si) {
if ((*si) == *i) {
break;
}
}
if (si == s.end()) {
if (find (s.begin(), s.end(), *i) == s.end()) {
s.push_back (*i);
}
}