fixes

extensions/src/state.rs

@@ -31,7 +31,7 @@
 //! }
 //!
 //! struct MyHostShared<'a> {
-//!     state_ext: OnceLock<Option<&'a PluginState>>
+//!     state_ext: OnceLock<Option<PluginState>>
 //! }
 //!
 //! impl<'a> HostShared<'a> for MyHostShared<'a> {
@@ -45,13 +45,12 @@
 //!
 //! struct MyHostMainThread<'a> {
 //!     shared: &'a MyHostShared<'a>,
-//!     plugin: Option<PluginMainThreadHandle<'a>>,
 //!     is_state_dirty: bool
 //! }
 //!
 //! impl<'a> HostMainThread<'a> for MyHostMainThread<'a> {
 //!     /* ... */
-//! #    fn instantiated(&mut self, instance: PluginMainThreadHandle<'a>) { self.plugin = Some(instance); }
+//! #    fn initialized(&mut self, _instance: InitializedPluginHandle<'a>) {}
 //! }
 //!
 //! // Implement the Host State extension for the plugin to notify us of its dirty save state
@@ -99,7 +98,7 @@
 //! # pub fn main() -> Result<(), Box<dyn Error>> {
 //! # mod utils { include!("./__doc_utils.rs"); }
 //! let mut plugin_instance: PluginInstance<MyHost> = /* ... */
-//! # utils::get_working_instance(|_| MyHostShared { state_ext: OnceLock::new() }, |shared| MyHostMainThread { is_state_dirty: false, shared, plugin: None })?;
+//! # utils::get_working_instance(|_| MyHostShared { state_ext: OnceLock::new() }, |shared| MyHostMainThread { is_state_dirty: false, shared })?;
 //!
 //! // We just loaded our plugin, but we have a preset to initialize it to.
 //! let preset_data = b"I'm a totally legit preset.";

host/src/process/audio_buffers.rs

@@ -595,7 +595,7 @@ mod test {
         }]);
 
         assert_eq!(buffers.buffers.len(), 1);
-        assert_eq!(buffers.frames_count, 4);
+        assert_eq!(buffers.frames_count, Some(4));
     }
 
     #[test]
@@ -611,7 +611,7 @@ mod test {
         }]);
 
         assert_eq!(buffers.buffers.len(), 1);
-        assert_eq!(buffers.frames_count, 4);
+        assert_eq!(buffers.frames_count, Some(4));
 
         assert_eq!(bufs.len(), 2); // Check borrow still works
         assert_eq!(ports.port_count(), 1);
@@ -634,7 +634,7 @@ mod test {
         }]);
 
         assert_eq!(buffers.buffers.len(), 1);
-        assert_eq!(buffers.frames_count, 4);
+        assert_eq!(buffers.frames_count, Some(4));
     }
 
     #[test]
@@ -651,7 +651,7 @@ mod test {
         }]);
 
         assert_eq!(buffers.buffers.len(), 1);
-        assert_eq!(buffers.frames_count, 4);
+        assert_eq!(buffers.frames_count, Some(4));
 
         assert_eq!(bufs.len(), 2); // Check borrow still works
         assert_eq!(ports.port_count(), 1);
@@ -684,9 +684,9 @@ mod test {
             }));
 
         assert_eq!(input_buffers.buffers.len(), 2);
-        assert_eq!(input_buffers.frames_count, 4);
+        assert_eq!(input_buffers.frames_count, Some(4));
         assert_eq!(output_buffers.buffers.len(), 2);
-        assert_eq!(output_buffers.frames_count, 4);
+        assert_eq!(output_buffers.frames_count, Some(4));
 
         let raw_input_buffers = input_buffers.as_raw_buffers();
         let raw_output_buffers = output_buffers.as_raw_buffers();

plugin/src/process/audio.rs

@@ -39,11 +39,15 @@ pub mod tests {
             ),
         }]);
 
+        let frames_count = match (input_buffers.frames_count(), output_buffers.frames_count()) {
+            (Some(a), Some(b)) => a.min(b),
+            (Some(a), None) | (None, Some(a)) => a,
+            (None, None) => 0,
+        };
+
         Audio {
             inputs: input_buffers.as_raw_buffers(),
-            frames_count: input_buffers
-                .frames_count()
-                .min(output_buffers.frames_count()),
+            frames_count,
             outputs: output_buffers.into_raw_buffers(),
         }
     }