sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure that default paths don't have duplicates

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-10-30 08:00:41 +01:00
parent 99b7780ff3
commit 21ed20bce1
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
vst/SfizzFileScan.cpp
View file

@ -8,6 +8,7 @@
#include "SfizzForeignPaths.h" #include "SfizzForeignPaths.h"
#include "NativeHelpers.h" #include "NativeHelpers.h"
#include <absl/strings/ascii.h> #include <absl/strings/ascii.h>
#include <absl/algorithm/container.h>
#include <vector> #include <vector>
#include <memory> #include <memory>
@ -182,14 +183,18 @@ absl::Span<const fs::path> sfzDefaultPaths()
static const auto paths = []() -> std::vector<fs::path> { static const auto paths = []() -> std::vector<fs::path> {
std::vector<fs::path> paths; std::vector<fs::path> paths;
paths.reserve(8); paths.reserve(8);
auto addPath = [&paths](const fs::path& newPath) {
if (absl::c_find(paths, newPath) == paths.end())
paths.push_back(newPath);
};
paths.push_back(getUserDocumentsDirectory() / "SFZ instruments"); addPath(getUserDocumentsDirectory() / "SFZ instruments");
for (const fs::path& foreign : { for (const fs::path& foreign : {
getAriaPathSetting("user_files_dir"), getAriaPathSetting("user_files_dir"),
getAriaPathSetting("Converted_path") }) getAriaPathSetting("Converted_path") })
if (!foreign.empty() && foreign.is_absolute()) if (!foreign.empty() && foreign.is_absolute())
paths.push_back(foreign); addPath(foreign);
paths.shrink_to_fit(); paths.shrink_to_fit();
return paths; return paths;