vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-06-20 11:02:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use Boost.Filesystem for the configuration

Browse Source 
I'd much rather just use std::filesystem, but since all of
Boost.Process, Boost.DLL Boost.Asio uses its own filesystem library we
need to use it anyways.
This commit is contained in:
Robbert van der Helm
2020-05-15 14:54:42 +02:00
parent d9ff98de84
commit f96c08775a
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugin/configuration.h
+6 -6
View File
@@ -16,7 +16,7 @@
#pragma once #pragma once
#include <filesystem> #include <boost/filesystem.hpp>
#include <optional> #include <optional>
/** /**
@@ -34,13 +34,13 @@
* @return The path to the *file* found, or `std::nullopt` if the file could not * @return The path to the *file* found, or `std::nullopt` if the file could not
* be found. * be found.
*/ */
template <typename F = bool(const std::filesystem::path&)> template <typename F = bool(const boost::filesystem::path&)>
std::optional<std::filesystem::path> find_dominating_file( std::optional<boost::filesystem::path> find_dominating_file(
const std::string& filename, const std::string& filename,
std::filesystem::path starting_dir, boost::filesystem::path starting_dir,
F predicate = std::filesystem::exists) { F predicate = boost::filesystem::exists) {
while (starting_dir != "") { while (starting_dir != "") {
const std::filesystem::path candidate = starting_dir / filename; const boost::filesystem::path candidate = starting_dir / filename;
if (predicate(candidate)) { if (predicate(candidate)) {
return candidate; return candidate;
} }
src/plugin/utils.cpp
+5 -8
View File
@@ -55,16 +55,13 @@ std::string create_logger_prefix(const fs::path& socket_path) {
} }
std::optional<fs::path> find_wineprefix() { std::optional<fs::path> find_wineprefix() {
// We need these string conversions because Boost still doesn't use std::optional<fs::path> dosdevices_dir =
// std::filesystem paths find_dominating_file("dosdevices", find_vst_plugin(), fs::is_directory);
std::optional<std::filesystem::path> dosdevices_dir = if (!dosdevices_dir.has_value()) {
find_dominating_file("dosdevices", find_vst_plugin().string(), return std::nullopt;
std::filesystem::is_directory);
if (dosdevices_dir.has_value()) {
return dosdevices_dir->parent_path().string();
} }
return std::nullopt; return dosdevices_dir->parent_path();
} }
PluginArchitecture find_vst_architecture(fs::path plugin_path) { PluginArchitecture find_vst_architecture(fs::path plugin_path) {