vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-10 04:30:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

[yabridgectl] Update to use chainloader libraries

Browse Source
This commit is contained in:
Robbert van der Helm
2022-04-16 20:12:58 +02:00
parent 8710b6d63d
commit 585329541c
6 changed files with 79 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/yabridgectl/src/files.rs
+8 -8
View File
@@ -188,10 +188,10 @@ impl Vst3Module {
}
}
/// Get the path to the `libyabridge.so` file in `~/.vst3` corresponding to the bridged version
/// of this module. The path here depends on whether we're using a 32-bit or 64-bit version of
/// yabridge. If the configuration is not given (for instance, becuase yabridge is not set up
/// properly) we'll assume the module should be 64-bit.
/// Get the path to the renamed `plugin.so` file in `~/.vst3` corresponding to the bridged
/// version of this module. The path here depends on whether we're using a 32-bit or 64-bit
/// version of yabridge. If the configuration is not given (for instance, becuase yabridge is
/// not set up properly) we'll assume the module should be 64-bit.
pub fn target_native_module_path(&self, config: Option<&YabridgeFiles>) -> PathBuf {
let native_module_name = match &self.module {
Vst3ModuleType::Legacy(path) | Vst3ModuleType::Bundle(path) => path
@@ -207,11 +207,11 @@ impl Vst3Module {
path.push("Contents");
#[allow(clippy::wildcard_in_or_patterns)]
match config.and_then(|c| c.libyabridge_vst3.as_ref()) {
match config.and_then(|c| c.vst3_chainloader.as_ref()) {
Some((_, LibArchitecture::Lib32)) => path.push("i386-linux"),
// NOTE: We'll always fall back to this if `libyabridge-vst3.so` is not found, just so
// we cannot get any errors during `yabridgectl status` even if yabridge is not
// set up correctly.
// NOTE: We'll always fall back to this if `libyabridge-chainloader-vst3.so` is not
// found, just so we cannot get any errors during `yabridgectl status` even if
// yabridge is not set up correctly.
Some((_, LibArchitecture::Lib64)) | _ => path.push("x86_64-linux"),
}