added const defaults and types for mono and stereo echo, removed unnecessary config field

Author: piedoom

crates/firewheel-nodes/src/echo.rs

@@ -1,7 +1,7 @@
 use core::{array::from_fn, num::NonZeroU32};
 
 use firewheel_core::{
-    channel_config::{ChannelConfig, NonZeroChannelCount},
+    channel_config::ChannelConfig,
     diff::{Diff, Notify, Patch},
     dsp::{
         buffer::ChannelBuffer,
@@ -27,6 +27,9 @@ use firewheel_core::{
 #[cfg(not(feature = "std"))]
 use num_traits::Float;
 
+pub type EchoNodeMono = EchoNode<1>;
+pub type EchoNodeStereo = EchoNode<2>;
+
 const DEFAULT_DELAY_SMOOTH_SECONDS: f32 = 0.25;
 
 /// The configuration for an [`EchoNode`]
@@ -37,41 +40,30 @@ const DEFAULT_DELAY_SMOOTH_SECONDS: f32 = 0.25;
 pub struct EchoNodeConfig {
     /// The maximum amount of samples available per channel
     pub buffer_capacity: usize,
-    /// The number of supported channels
-    pub channels: NonZeroChannelCount,
 }
 
 impl EchoNodeConfig {
     /// Create a configuration that can hold up to a specified number of seconds
     /// of audio
-    pub fn new(
-        max_duration_seconds: f32,
-        sample_rate: impl Into<NonZeroU32>,
-        channels: impl Into<NonZeroChannelCount>,
-    ) -> Self {
+    pub fn new(max_duration_seconds: f32, sample_rate: impl Into<NonZeroU32>) -> Self {
         Self {
             buffer_capacity: (max_duration_seconds * sample_rate.into().get() as f32).ceil()
                 as usize,
-            channels: channels.into(),
         }
     }
 }
 
 impl Default for EchoNodeConfig {
     fn default() -> Self {
         // Assume a common rate, as it cannot be known at compile time
-        Self::new(
-            5.0,
-            NonZeroU32::new(44_100).unwrap(),
-            NonZeroChannelCount::STEREO,
-        )
+        Self::new(5.0, NonZeroU32::new(44_100).unwrap())
     }
 }
 
 #[derive(Diff, Patch, Debug, Clone, Copy, PartialEq)]
 #[cfg_attr(feature = "bevy", derive(bevy_ecs::prelude::Component))]
 #[cfg_attr(feature = "bevy_reflect", derive(bevy_reflect::Reflect))]
-pub struct EchoNode<const CHANNELS: usize> {
+pub struct EchoNode<const CHANNELS: usize = 2> {
     /// The lowpass frequency in hertz in the range
     /// `[20.0, 20480.0]`.
     pub feedback_lpf: f32,

examples/visual_node_graph/src/system.rs

@@ -8,7 +8,7 @@ use firewheel::{
     nodes::{
         beep_test::BeepTestNode,
         convolution::{ConvolutionNode, ConvolutionNodeConfig},
-        echo::EchoNode,
+        echo::{EchoNodeMono, EchoNodeStereo},
         fast_filters::{
             bandpass::FastBandpassNode, highpass::FastHighpassNode, lowpass::FastLowpassNode,
         },
@@ -182,8 +182,8 @@ impl AudioSystem {
                 }),
             ),
             NodeType::ConvolutionStereo => self.cx.add_node(ConvolutionNode::<2>::default(), None),
-            NodeType::EchoMono => self.cx.add_node(EchoNode::<1>::default(), None),
-            NodeType::EchoStereo => self.cx.add_node(EchoNode::<2>::default(), None),
+            NodeType::EchoMono => self.cx.add_node(EchoNodeMono::default(), None),
+            NodeType::EchoStereo => self.cx.add_node(EchoNodeStereo::default(), None),
         };
 
         match node_type {