diff --git a/src/wrapper/standalone.rs b/src/wrapper/standalone.rs index d9ce1e04..9f4b2022 100644 --- a/src/wrapper/standalone.rs +++ b/src/wrapper/standalone.rs @@ -80,7 +80,7 @@ pub fn nih_export_standalone_with_args(config.clone(), cpal::HostId::Alsa) { + match backend::CpalMidir::new::

(config.clone(), cpal::HostId::Alsa) { Ok(backend) => { nih_log!("Using the ALSA backend"); Ok(run_wrapper::(backend, config.clone())) @@ -96,7 +96,7 @@ pub fn nih_export_standalone_with_args(config.clone(), cpal::HostId::CoreAudio) { + match backend::CpalMidir::new::

(config.clone(), cpal::HostId::CoreAudio) { Ok(backend) => { nih_log!("Using the CoreAudio backend"); Ok(run_wrapper::(backend, config.clone())) @@ -112,7 +112,7 @@ pub fn nih_export_standalone_with_args(config.clone(), cpal::HostId::Wasapi) { + match backend::CpalMidir::new::

(config.clone(), cpal::HostId::Wasapi) { Ok(backend) => { nih_log!("Using the WASAPI backend"); Ok(run_wrapper::(backend, config.clone())) @@ -141,7 +141,7 @@ pub fn nih_export_standalone_with_args { - match backend::Cpal::new::

(config.clone(), cpal::HostId::Alsa) { + match backend::CpalMidir::new::

(config.clone(), cpal::HostId::Alsa) { Ok(backend) => run_wrapper::(backend, config), Err(err) => { nih_error!("Could not initialize the ALSA backend: {:#}", err); @@ -151,7 +151,7 @@ pub fn nih_export_standalone_with_args { - match backend::Cpal::new::

(config.clone(), cpal::HostId::CoreAudio) { + match backend::CpalMidir::new::

(config.clone(), cpal::HostId::CoreAudio) { Ok(backend) => run_wrapper::(backend, config), Err(err) => { nih_error!("Could not initialize the CoreAudio backend: {:#}", err); @@ -161,7 +161,7 @@ pub fn nih_export_standalone_with_args { - match backend::Cpal::new::

(config.clone(), cpal::HostId::Wasapi) { + match backend::CpalMidir::new::

(config.clone(), cpal::HostId::Wasapi) { Ok(backend) => run_wrapper::(backend, config), Err(err) => { nih_error!("Could not initialize the WASAPI backend: {:#}", err); diff --git a/src/wrapper/standalone/backend.rs b/src/wrapper/standalone/backend.rs index c31d1adf..77b8001e 100644 --- a/src/wrapper/standalone/backend.rs +++ b/src/wrapper/standalone/backend.rs @@ -6,7 +6,7 @@ mod cpal; mod dummy; mod jack; -pub use self::cpal::Cpal; +pub use self::cpal::CpalMidir; pub use self::dummy::Dummy; pub use self::jack::Jack; pub use crate::buffer::Buffer; diff --git a/src/wrapper/standalone/backend/cpal.rs b/src/wrapper/standalone/backend/cpal.rs index 21eb07e6..2acb90e6 100644 --- a/src/wrapper/standalone/backend/cpal.rs +++ b/src/wrapper/standalone/backend/cpal.rs @@ -17,7 +17,7 @@ use crate::midi::{MidiConfig, PluginNoteEvent}; use crate::plugin::Plugin; /// Uses CPAL for audio and midir for MIDI. -pub struct Cpal { +pub struct CpalMidir { config: WrapperConfig, audio_io_layout: AudioIOLayout, @@ -29,7 +29,7 @@ pub struct Cpal { // TODO: MIDI } -impl Backend

for Cpal { +impl Backend

for CpalMidir { fn run( &mut self, cb: impl FnMut( @@ -135,7 +135,7 @@ impl Backend

for Cpal { } } -impl Cpal { +impl CpalMidir { /// Initialize the backend with the specified host. Returns an error if this failed for whatever /// reason. pub fn new(config: WrapperConfig, cpal_host_id: cpal::HostId) -> Result { @@ -293,7 +293,7 @@ impl Cpal { nih_warn!("Auxiliary outputs are not supported with this audio backend"); } - Ok(Cpal { + Ok(CpalMidir { config, audio_io_layout,