alex/nih-plug
1
0
Fork 0
Code Activity

Store a reference to the wrapper on the wrapper

Browse source
This commit is contained in:
Robbert van der Helm 2022-03-03 15:13:36 +01:00
parent 6d63d3f095
commit 87830abdf6
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/wrapper/clap/wrapper.rs
View file

@ -40,7 +40,7 @@ use std::ffi::{c_void, CStr};
use std::os::raw::c_char; use std::os::raw::c_char;
use std::ptr; use std::ptr;
use std::sync::atomic::{AtomicBool, AtomicU32, Ordering}; use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
use std::sync::Arc; use std::sync::{Arc, Weak};
use std::thread::{self, ThreadId}; use std::thread::{self, ThreadId};
use super::context::WrapperProcessContext; use super::context::WrapperProcessContext;
@ -66,6 +66,9 @@ pub struct Wrapper<P: ClapPlugin> {
// Keep the vtable as the first field so we can do a simple pointer cast // Keep the vtable as the first field so we can do a simple pointer cast
pub clap_plugin: clap_plugin, pub clap_plugin: clap_plugin,
/// A reference to this object, upgraded to an `Arc<Self>` for the GUI context.
this: RwLock<Weak<Self>>,
/// The wrapped plugin instance. /// The wrapped plugin instance.
plugin: RwLock<P>, plugin: RwLock<P>,
@ -247,6 +250,8 @@ impl<P: ClapPlugin> Wrapper<P> {
on_main_thread: Self::on_main_thread, on_main_thread: Self::on_main_thread,
}, },
this: RwLock::new(Weak::new()),
plugin: RwLock::new(P::default()), plugin: RwLock::new(P::default()),
current_bus_config: AtomicCell::new(BusConfig { current_bus_config: AtomicCell::new(BusConfig {
num_input_channels: P::DEFAULT_NUM_INPUTS, num_input_channels: P::DEFAULT_NUM_INPUTS,
@ -372,7 +377,12 @@ impl<P: ClapPlugin> Wrapper<P> {
.map(|(_, hash, ptr)| (*ptr, hash)) .map(|(_, hash, ptr)| (*ptr, hash))
.collect(); .collect();
Arc::new(wrapper) // Finally, the wrapper needs to contain a reference to itself so we can create GuiContexts
// when opening plugin editors
let wrapper = Arc::new(wrapper);
*wrapper.this.write() = Arc::downgrade(&wrapper);
wrapper
} }
fn make_process_context(&self) -> WrapperProcessContext<'_, P> { fn make_process_context(&self) -> WrapperProcessContext<'_, P> {