pass a single Block struct containing Buffers and Events to process()

examples/gain/src/lib.rs

@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use coupler::format::clap::*;
 use coupler::format::vst3::*;
-use coupler::{buffers::*, bus::*, events::*, params::*, parent::*, *};
+use coupler::{block::*, buffers::*, bus::*, events::*, params::*, parent::*, *};
 
 #[derive(Params, Serialize, Deserialize, Clone)]
 struct GainParams {
@@ -113,8 +113,8 @@ impl Processor for GainProcessor {
 
     fn reset(&mut self) {}
 
-    fn process(&mut self, mut buffers: Buffers, events: Events) {
-        for event in events {
+    fn process(&mut self, mut block: Block) {
+        for event in block.events {
             match event.data {
                 Data::ParamChange { id, value } => {
                     self.params.set_param(id, value);
@@ -123,7 +123,7 @@ impl Processor for GainProcessor {
             }
         }
 
-        let Some(BufferDir::InOut(mut main)) = buffers.get(0) else {
+        let Some(BufferDir::InOut(mut main)) = block.buffers.get(0) else {
             unreachable!();
         };
 

src/block.rs

@@ -0,0 +1,7 @@
+use crate::buffers::Buffers;
+use crate::events::Events;
+
+pub struct Block<'a, 'b, 'c> {
+    pub buffers: Buffers<'a, 'b>,
+    pub events: Events<'c>,
+}

src/format/clap/instance.rs

@@ -9,6 +9,7 @@ use std::{io, ptr, slice};
 use clap_sys::ext::{audio_ports::*, audio_ports_config::*, gui::*, params::*, state::*};
 use clap_sys::{events::*, id::*, plugin::*, process::*, stream::*};
 
+use crate::block::Block;
 use crate::buffers::{Buffers, BusData};
 use crate::bus::{BusDir, Format};
 use crate::events::{Data, Event, Events};
@@ -308,10 +309,10 @@ impl<P: Plugin> Instance<P> {
         }
 
         instance.sync_processor(processor);
-        processor.process(
-            Buffers::from_raw_parts(&process_state.buses, &process_state.buffer_ptrs, len),
-            Events::new(&process_state.events),
-        );
+        processor.process(Block {
+            buffers: Buffers::from_raw_parts(&process_state.buses, &process_state.buffer_ptrs, len),
+            events: Events::new(&process_state.events),
+        });
 
         CLAP_PROCESS_CONTINUE
     }

src/format/vst3/component.rs

@@ -9,6 +9,7 @@ use vst3::{Class, ComRef, ComWrapper, Steinberg::Vst::*, Steinberg::*};
 use super::buffers::ScratchBuffers;
 use super::util::{copy_wstring, utf16_from_ptr};
 use super::view::View;
+use crate::block::Block;
 use crate::bus::{BusDir, Format, Layout};
 use crate::events::{Data, Event, Events};
 use crate::sync::params::ParamValues;
@@ -518,7 +519,10 @@ impl<P: Plugin> IAudioProcessorTrait for Component<P> {
         }
 
         self.sync_processor(processor);
-        processor.process(buffers, Events::new(&process_state.events));
+        processor.process(Block {
+            buffers,
+            events: Events::new(&process_state.events),
+        });
 
         kResultOk
     }

src/lib.rs

@@ -1,5 +1,6 @@
 use std::io::{self, Read, Write};
 
+pub mod block;
 pub mod buffers;
 pub mod bus;
 pub mod events;
@@ -10,9 +11,8 @@ pub mod parent;
 mod sync;
 mod util;
 
-use buffers::Buffers;
+use block::Block;
 use bus::{BusInfo, Layout};
-use events::Events;
 use params::ParamInfo;
 use parent::Parent;
 
@@ -62,7 +62,7 @@ pub struct Config {
 pub trait Processor: Send + Sized + 'static {
     fn set_param(&mut self, id: ParamId, value: ParamValue);
     fn reset(&mut self);
-    fn process(&mut self, buffers: Buffers, events: Events);
+    fn process(&mut self, block: Block);
 }
 
 pub struct Size {