diff --git a/nih_plug_derive/src/lib.rs b/nih_plug_derive/src/lib.rs index eb71347a..2cc498b5 100644 --- a/nih_plug_derive/src/lib.rs +++ b/nih_plug_derive/src/lib.rs @@ -104,9 +104,9 @@ pub fn derive_params(input: TokenStream) -> TokenStream { // function we get type erasure for free since we only need to worry about byte // vectors field_serialize_tokens.push(quote! { - match ::nih_plug::params::PersistentField::map( + match ::nih_plug::param::PersistentField::map( &self.#field_name, - ::nih_plug::params::serialize_field, + ::nih_plug::param::serialize_field, ) { Ok(data) => { serialized.insert(String::from(#stable_name), data); @@ -118,9 +118,9 @@ pub fn derive_params(input: TokenStream) -> TokenStream { }); field_deserialize_tokens.push(quote! { #stable_name => { - match ::nih_plug::params::deserialize_field(&data) { + match ::nih_plug::param::deserialize_field(&data) { Ok(deserialized) => { - ::nih_plug::params::PersistentField::set( + ::nih_plug::param::PersistentField::set( &self.#field_name, deserialized, ); @@ -152,7 +152,7 @@ pub fn derive_params(input: TokenStream) -> TokenStream { impl Params for #struct_name { fn param_map( self: std::pin::Pin<&Self>, - ) -> std::collections::HashMap<&'static str, nih_plug::params::ParamPtr> { + ) -> std::collections::HashMap<&'static str, nih_plug::param::ParamPtr> { let mut param_map = std::collections::HashMap::new(); #(#param_mapping_insert_tokens)* diff --git a/plugins/gain/src/lib.rs b/plugins/gain/src/lib.rs index 972ba6ba..cdab3497 100644 --- a/plugins/gain/src/lib.rs +++ b/plugins/gain/src/lib.rs @@ -20,7 +20,7 @@ extern crate nih_plug; use nih_plug::{ context::ProcessContext, formatters, - params::{BoolParam, FloatParam, Param, Params, Range}, + param::{BoolParam, FloatParam, Param, Params, Range}, plugin::{BufferConfig, BusConfig, Plugin, ProcessStatus, Vst3Plugin}, util, }; diff --git a/plugins/sine/src/lib.rs b/plugins/sine/src/lib.rs index 241ad18c..6510272f 100644 --- a/plugins/sine/src/lib.rs +++ b/plugins/sine/src/lib.rs @@ -20,7 +20,7 @@ extern crate nih_plug; use nih_plug::{ context::ProcessContext, formatters, - params::{FloatParam, Param, Params, Range}, + param::{FloatParam, Param, Params, Range}, plugin::{BufferConfig, BusConfig, Plugin, ProcessStatus, Vst3Plugin}, util, }; diff --git a/src/lib.rs b/src/lib.rs index eb133eea..04bb6ab2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -20,7 +20,7 @@ pub mod context; #[macro_use] pub mod debug; pub mod formatters; -pub mod params; +pub mod param; pub mod plugin; pub mod util; pub mod wrapper; diff --git a/src/params.rs b/src/param.rs similarity index 100% rename from src/params.rs rename to src/param.rs diff --git a/src/plugin.rs b/src/plugin.rs index 21efe1ad..74afe674 100644 --- a/src/plugin.rs +++ b/src/plugin.rs @@ -17,7 +17,7 @@ use std::pin::Pin; use crate::context::ProcessContext; -use crate::params::Params; +use crate::param::Params; /// Basic functionality that needs to be implemented by a plugin. The wrappers will use this to /// expose the plugin in a particular plugin format. diff --git a/src/wrapper/vst3.rs b/src/wrapper/vst3.rs index 1675b645..debfed58 100644 --- a/src/wrapper/vst3.rs +++ b/src/wrapper/vst3.rs @@ -41,7 +41,7 @@ use vst3_sys::VST3; use widestring::U16CStr; use crate::context::{EventLoop, MainThreadExecutor, OsEventLoop, ProcessContext}; -use crate::params::{Param, ParamPtr}; +use crate::param::{Param, ParamPtr}; use crate::plugin::{BufferConfig, BusConfig, Plugin, ProcessStatus, Vst3Plugin}; use crate::wrapper::state::{ParamValue, State}; use crate::wrapper::util::{hash_param_id, strlcpy, u16strlcpy}; @@ -634,7 +634,7 @@ impl IEditController for Wrapper<'_, P> { info.step_count = match param_ptr { ParamPtr::FloatParam(_) => 0, ParamPtr::IntParam(p) => match (**p).range { - crate::params::Range::Linear { min, max } => max - min, + crate::param::Range::Linear { min, max } => max - min, }, ParamPtr::BoolParam(_) => 1, };