Rename all SomeNodeOptions.channel_config to audio_node_options

orottier · orottier · commit 47e37dbc6b98 · 2024-04-01T20:44:31.000+02:00
diff --git a/examples/worklet_message_port.rs b/examples/worklet_message_port.rs
@@ -42,7 +42,7 @@ impl WhiteNoiseNode {
             output_channel_count: vec![1],
             parameter_data: HashMap::new(),
             processor_options: (),
-            channel_config: AudioNodeOptions::default(),
+            audio_node_options: AudioNodeOptions::default(),
         };
 
         let node = AudioWorkletNode::new::<WhiteNoiseProcessor>(context.base(), options);
diff --git a/src/context/base.rs b/src/context/base.rs
@@ -186,7 +186,7 @@ pub trait BaseAudioContext {
     #[must_use]
     fn create_iir_filter(&self, feedforward: Vec<f64>, feedback: Vec<f64>) -> node::IIRFilterNode {
         let options = node::IIRFilterOptions {
-            channel_config: AudioNodeOptions::default(),
+            audio_node_options: AudioNodeOptions::default(),
             feedforward,
             feedback,
         };
diff --git a/src/node/analyser.rs b/src/node/analyser.rs
@@ -22,7 +22,7 @@ pub struct AnalyserOptions {
     pub max_decibels: f64,
     pub min_decibels: f64,
     pub smoothing_time_constant: f64,
-    pub channel_config: AudioNodeOptions,
+    pub audio_node_options: AudioNodeOptions,
 }
 
 impl Default for AnalyserOptions {
@@ -32,7 +32,7 @@ impl Default for AnalyserOptions {
             max_decibels: DEFAULT_MAX_DECIBELS,
             min_decibels: DEFAULT_MIN_DECIBELS,
             smoothing_time_constant: DEFAULT_SMOOTHING_TIME_CONSTANT,
-            channel_config: AudioNodeOptions::default(),
+            audio_node_options: AudioNodeOptions::default(),
         }
     }
 }
@@ -123,7 +123,7 @@ impl AnalyserNode {
 
             let node = AnalyserNode {
                 registration,
-                channel_config: options.channel_config.into(),
+                channel_config: options.audio_node_options.into(),
                 analyser,
             };
 
diff --git a/src/node/biquad_filter.rs b/src/node/biquad_filter.rs
@@ -235,7 +235,7 @@ pub struct BiquadFilterOptions {
     pub frequency: f32,
     pub gain: f32,
     pub type_: BiquadFilterType,
-    pub channel_config: AudioNodeOptions,
+    pub audio_node_options: AudioNodeOptions,
 }
 
 impl Default for BiquadFilterOptions {
@@ -246,7 +246,7 @@ impl Default for BiquadFilterOptions {
             frequency: 350.,
             gain: 0.,
             type_: BiquadFilterType::default(),
-            channel_config: AudioNodeOptions::default(),
+            audio_node_options: AudioNodeOptions::default(),
         }
     }
 }
@@ -351,7 +351,7 @@ impl BiquadFilterNode {
                 frequency,
                 gain,
                 type_,
-                channel_config,
+                audio_node_options: channel_config,
             } = options;
 
             let q_param_options = AudioParamDescriptor {
diff --git a/src/node/channel_merger.rs b/src/node/channel_merger.rs
@@ -66,14 +66,14 @@ fn assert_valid_channel_count_mode(mode: ChannelCountMode) {
 #[derive(Clone, Debug)]
 pub struct ChannelMergerOptions {
     pub number_of_inputs: usize,
-    pub channel_config: AudioNodeOptions,
+    pub audio_node_options: AudioNodeOptions,
 }
 
 impl Default for ChannelMergerOptions {
     fn default() -> Self {
         Self {
             number_of_inputs: 6,
-            channel_config: AudioNodeOptions {
+            audio_node_options: AudioNodeOptions {
                 channel_count: 1,
                 channel_count_mode: ChannelCountMode::Explicit,
                 channel_interpretation: ChannelInterpretation::Speakers,
@@ -124,12 +124,12 @@ impl ChannelMergerNode {
         context.base().register(move |registration| {
             assert_valid_number_of_channels(options.number_of_inputs);
 
-            assert_valid_channel_count(options.channel_config.channel_count);
-            assert_valid_channel_count_mode(options.channel_config.channel_count_mode);
+            assert_valid_channel_count(options.audio_node_options.channel_count);
+            assert_valid_channel_count_mode(options.audio_node_options.channel_count_mode);
 
             let node = ChannelMergerNode {
                 registration,
-                channel_config: options.channel_config.into(),
+                channel_config: options.audio_node_options.into(),
                 number_of_inputs: options.number_of_inputs,
             };
 
diff --git a/src/node/channel_splitter.rs b/src/node/channel_splitter.rs
@@ -66,14 +66,14 @@ fn assert_valid_channel_interpretation(interpretation: ChannelInterpretation) {
 #[derive(Clone, Debug)]
 pub struct ChannelSplitterOptions {
     pub number_of_outputs: usize,
-    pub channel_config: AudioNodeOptions,
+    pub audio_node_options: AudioNodeOptions,
 }
 
 impl Default for ChannelSplitterOptions {
     fn default() -> Self {
         Self {
             number_of_outputs: 6,
-            channel_config: AudioNodeOptions {
+            audio_node_options: AudioNodeOptions {
                 channel_count: 6, // must be same as number_of_outputs
                 channel_count_mode: ChannelCountMode::Explicit,
                 channel_interpretation: ChannelInterpretation::Discrete,
@@ -131,14 +131,14 @@ impl ChannelSplitterNode {
     pub fn new<C: BaseAudioContext>(context: &C, mut options: ChannelSplitterOptions) -> Self {
         context.base().register(move |registration| {
             assert_valid_number_of_channels(options.number_of_outputs);
-            options.channel_config.channel_count = options.number_of_outputs;
+            options.audio_node_options.channel_count = options.number_of_outputs;
 
-            assert_valid_channel_count_mode(options.channel_config.channel_count_mode);
-            assert_valid_channel_interpretation(options.channel_config.channel_interpretation);
+            assert_valid_channel_count_mode(options.audio_node_options.channel_count_mode);
+            assert_valid_channel_interpretation(options.audio_node_options.channel_interpretation);
 
             let node = ChannelSplitterNode {
                 registration,
-                channel_config: options.channel_config.into(),
+                channel_config: options.audio_node_options.into(),
             };
 
             let render = ChannelSplitterRenderer {
diff --git a/src/node/convolver.rs b/src/node/convolver.rs
@@ -65,7 +65,7 @@ pub struct ConvolverOptions {
     /// The opposite of the desired initial value for the normalize attribute
     pub disable_normalization: bool,
     /// AudioNode options
-    pub channel_config: AudioNodeOptions,
+    pub audio_node_options: AudioNodeOptions,
 }
 
 /// Processing node which applies a linear convolution effect given an impulse response.
@@ -154,7 +154,7 @@ impl ConvolverNode {
         let ConvolverOptions {
             buffer,
             disable_normalization,
-            channel_config,
+            audio_node_options: channel_config,
         } = options;
 
         let mut node = context.base().register(move |registration| {
diff --git a/src/node/delay.rs b/src/node/delay.rs
@@ -19,15 +19,15 @@ use std::rc::Rc;
 pub struct DelayOptions {
     pub max_delay_time: f64,
     pub delay_time: f64,
-    pub channel_config: AudioNodeOptions,
+    pub audio_node_options: AudioNodeOptions,
 }
 
 impl Default for DelayOptions {
     fn default() -> Self {
         Self {
             max_delay_time: 1.,
             delay_time: 0.,
-            channel_config: AudioNodeOptions::default(),
+            audio_node_options: AudioNodeOptions::default(),
         }
     }
 }
@@ -254,7 +254,7 @@ impl DelayNode {
                 let node = DelayNode {
                     reader_registration,
                     writer_registration,
-                    channel_config: options.channel_config.into(),
+                    channel_config: options.audio_node_options.into(),
                     delay_time: param,
                 };
 
diff --git a/src/node/dynamics_compressor.rs b/src/node/dynamics_compressor.rs
@@ -42,7 +42,7 @@ pub struct DynamicsCompressorOptions {
     pub ratio: f32,
     pub release: f32,
     pub threshold: f32,
-    pub channel_config: AudioNodeOptions,
+    pub audio_node_options: AudioNodeOptions,
 }
 
 impl Default for DynamicsCompressorOptions {
@@ -53,7 +53,7 @@ impl Default for DynamicsCompressorOptions {
             ratio: 12.,      // unit less
             release: 0.25,   // seconds
             threshold: -24., // dB
-            channel_config: AudioNodeOptions::default(),
+            audio_node_options: AudioNodeOptions::default(),
         }
     }
 }
@@ -215,7 +215,7 @@ impl DynamicsCompressorNode {
 
             let node = DynamicsCompressorNode {
                 registration,
-                channel_config: options.channel_config.into(),
+                channel_config: options.audio_node_options.into(),
                 attack: attack_param,
                 knee: knee_param,
                 ratio: ratio_param,
diff --git a/src/node/gain.rs b/src/node/gain.rs
@@ -13,14 +13,14 @@ use super::{AudioNode, AudioNodeOptions, ChannelConfig};
 #[derive(Clone, Debug)]
 pub struct GainOptions {
     pub gain: f32,
-    pub channel_config: AudioNodeOptions,
+    pub audio_node_options: AudioNodeOptions,
 }
 
 impl Default for GainOptions {
     fn default() -> Self {
         Self {
             gain: 1.,
-            channel_config: AudioNodeOptions::default(),
+            audio_node_options: AudioNodeOptions::default(),
         }
     }
 }
@@ -69,7 +69,7 @@ impl GainNode {
 
             let node = GainNode {
                 registration,
-                channel_config: options.channel_config.into(),
+                channel_config: options.audio_node_options.into(),
                 gain: param,
             };
 
diff --git a/src/node/iir_filter.rs b/src/node/iir_filter.rs
@@ -71,7 +71,7 @@ fn assert_valid_feedback_coefs(coefs: &[f64]) {
 #[derive(Clone, Debug)]
 pub struct IIRFilterOptions {
     /// audio node options
-    pub channel_config: AudioNodeOptions,
+    pub audio_node_options: AudioNodeOptions,
     /// feedforward coefficients
     pub feedforward: Vec<f64>, // go for Option<Vec<f32>> w/ default to None?
     /// feedback coefficients
@@ -187,7 +187,7 @@ impl IIRFilterNode {
             let IIRFilterOptions {
                 feedforward,
                 feedback,
-                channel_config,
+                audio_node_options: channel_config,
             } = options;
 
             assert_valid_feedforward_coefs(&feedforward);
@@ -418,7 +418,7 @@ mod tests {
             let options = IIRFilterOptions {
                 feedback: vec![1.; 3],
                 feedforward: vec![1.; 3],
-                channel_config: AudioNodeOptions::default(),
+                audio_node_options: AudioNodeOptions::default(),
             };
 
             let _biquad = IIRFilterNode::new(&context, options);
@@ -481,7 +481,7 @@ mod tests {
         let options = IIRFilterOptions {
             feedback: vec![1.; 10],
             feedforward: vec![1.; 10],
-            channel_config: AudioNodeOptions::default(),
+            audio_node_options: AudioNodeOptions::default(),
         };
         let iir = IIRFilterNode::new(&context, options);
 
@@ -499,7 +499,7 @@ mod tests {
         let options = IIRFilterOptions {
             feedback: vec![1.; 10],
             feedforward: vec![1.; 10],
-            channel_config: AudioNodeOptions::default(),
+            audio_node_options: AudioNodeOptions::default(),
         };
         let iir = IIRFilterNode::new(&context, options);
 
@@ -738,7 +738,7 @@ mod tests {
         let options = IIRFilterOptions {
             feedback,
             feedforward,
-            channel_config: AudioNodeOptions::default(),
+            audio_node_options: AudioNodeOptions::default(),
         };
         let iir = IIRFilterNode::new(&context, options);
 
diff --git a/src/node/oscillator.rs b/src/node/oscillator.rs
@@ -43,7 +43,7 @@ pub struct OscillatorOptions {
     /// Optional custom waveform, if specified (set `type` to "custom")
     pub periodic_wave: Option<PeriodicWave>,
     /// channel config options
-    pub channel_config: AudioNodeOptions,
+    pub audio_node_options: AudioNodeOptions,
 }
 
 impl Default for OscillatorOptions {
@@ -53,7 +53,7 @@ impl Default for OscillatorOptions {
             frequency: 440.,
             detune: 0.,
             periodic_wave: None,
-            channel_config: AudioNodeOptions::default(),
+            audio_node_options: AudioNodeOptions::default(),
         }
     }
 }
@@ -210,7 +210,7 @@ impl OscillatorNode {
             type_,
             frequency,
             detune,
-            channel_config,
+            audio_node_options: channel_config,
             periodic_wave,
         } = options;
 
diff --git a/src/node/panner.rs b/src/node/panner.rs
@@ -138,7 +138,7 @@ pub struct PannerOptions {
     pub cone_inner_angle: f64,
     pub cone_outer_angle: f64,
     pub cone_outer_gain: f64,
-    pub channel_config: AudioNodeOptions,
+    pub audio_node_options: AudioNodeOptions,
 }
 
 impl Default for PannerOptions {
@@ -158,7 +158,7 @@ impl Default for PannerOptions {
             cone_inner_angle: 360.,
             cone_outer_angle: 360.,
             cone_outer_gain: 0.,
-            channel_config: AudioNodeOptions {
+            audio_node_options: AudioNodeOptions {
                 channel_count: 2,
                 channel_count_mode: ChannelCountMode::ClampedMax,
                 channel_interpretation: ChannelInterpretation::Speakers,
@@ -407,7 +407,7 @@ impl PannerNode {
                 cone_inner_angle,
                 cone_outer_angle,
                 cone_outer_gain,
-                channel_config,
+                audio_node_options: channel_config,
                 panning_model,
             } = options;
 
diff --git a/src/node/stereo_panner.rs b/src/node/stereo_panner.rs
diff --git a/src/node/waveshaper.rs b/src/node/waveshaper.rs
diff --git a/src/worklet.rs b/src/worklet.rs

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ pub struct AnalyserOptions {`
`22`	`22`	`pub max_decibels: f64,`
`23`	`23`	`pub min_decibels: f64,`
`24`	`24`	`pub smoothing_time_constant: f64,`
`25`		`- pub channel_config: AudioNodeOptions,`
	`25`	`+ pub audio_node_options: AudioNodeOptions,`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`impl Default for AnalyserOptions {`
`@@ -32,7 +32,7 @@ impl Default for AnalyserOptions {`
`32`	`32`	`max_decibels: DEFAULT_MAX_DECIBELS,`
`33`	`33`	`min_decibels: DEFAULT_MIN_DECIBELS,`
`34`	`34`	`smoothing_time_constant: DEFAULT_SMOOTHING_TIME_CONSTANT,`
`35`		`- channel_config: AudioNodeOptions::default(),`
	`35`	`+ audio_node_options: AudioNodeOptions::default(),`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`}`
`@@ -123,7 +123,7 @@ impl AnalyserNode {`
`123`	`123`
`124`	`124`	`let node = AnalyserNode {`
`125`	`125`	`registration,`
`126`		`- channel_config: options.channel_config.into(),`
	`126`	`+ channel_config: options.audio_node_options.into(),`
`127`	`127`	`analyser,`
`128`	`128`	`};`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ pub struct BiquadFilterOptions {`
`235`	`235`	`pub frequency: f32,`
`236`	`236`	`pub gain: f32,`
`237`	`237`	`pub type_: BiquadFilterType,`
`238`		`- pub channel_config: AudioNodeOptions,`
	`238`	`+ pub audio_node_options: AudioNodeOptions,`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`impl Default for BiquadFilterOptions {`
`@@ -246,7 +246,7 @@ impl Default for BiquadFilterOptions {`
`246`	`246`	`frequency: 350.,`
`247`	`247`	`gain: 0.,`
`248`	`248`	`type_: BiquadFilterType::default(),`
`249`		`- channel_config: AudioNodeOptions::default(),`
	`249`	`+ audio_node_options: AudioNodeOptions::default(),`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`	`}`
`@@ -351,7 +351,7 @@ impl BiquadFilterNode {`
`351`	`351`	`frequency,`
`352`	`352`	`gain,`
`353`	`353`	`type_,`
`354`		`- channel_config,`
	`354`	`+ audio_node_options: channel_config,`
`355`	`355`	`} = options;`
`356`	`356`
`357`	`357`	`let q_param_options = AudioParamDescriptor {`
Original file line number	Diff line number	Diff line change
`@@ -19,15 +19,15 @@ use std::rc::Rc;`
`19`	`19`	`pub struct DelayOptions {`
`20`	`20`	`pub max_delay_time: f64,`
`21`	`21`	`pub delay_time: f64,`
`22`		`- pub channel_config: AudioNodeOptions,`
	`22`	`+ pub audio_node_options: AudioNodeOptions,`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`impl Default for DelayOptions {`
`26`	`26`	`fn default() -> Self {`
`27`	`27`	`Self {`
`28`	`28`	`max_delay_time: 1.,`
`29`	`29`	`delay_time: 0.,`
`30`		`- channel_config: AudioNodeOptions::default(),`
	`30`	`+ audio_node_options: AudioNodeOptions::default(),`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`
`@@ -254,7 +254,7 @@ impl DelayNode {`
`254`	`254`	`let node = DelayNode {`
`255`	`255`	`reader_registration,`
`256`	`256`	`writer_registration,`
`257`		`- channel_config: options.channel_config.into(),`
	`257`	`+ channel_config: options.audio_node_options.into(),`
`258`	`258`	`delay_time: param,`
`259`	`259`	`};`
`260`	`260`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ pub struct DynamicsCompressorOptions {`
`42`	`42`	`pub ratio: f32,`
`43`	`43`	`pub release: f32,`
`44`	`44`	`pub threshold: f32,`
`45`		`- pub channel_config: AudioNodeOptions,`
	`45`	`+ pub audio_node_options: AudioNodeOptions,`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`impl Default for DynamicsCompressorOptions {`
`@@ -53,7 +53,7 @@ impl Default for DynamicsCompressorOptions {`
`53`	`53`	`ratio: 12., // unit less`
`54`	`54`	`release: 0.25, // seconds`
`55`	`55`	`threshold: -24., // dB`
`56`		`- channel_config: AudioNodeOptions::default(),`
	`56`	`+ audio_node_options: AudioNodeOptions::default(),`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`
`@@ -215,7 +215,7 @@ impl DynamicsCompressorNode {`
`215`	`215`
`216`	`216`	`let node = DynamicsCompressorNode {`
`217`	`217`	`registration,`
`218`		`- channel_config: options.channel_config.into(),`
	`218`	`+ channel_config: options.audio_node_options.into(),`
`219`	`219`	`attack: attack_param,`
`220`	`220`	`knee: knee_param,`
`221`	`221`	`ratio: ratio_param,`
Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,14 @@ use super::{AudioNode, AudioNodeOptions, ChannelConfig};`
`13`	`13`	`#[derive(Clone, Debug)]`
`14`	`14`	`pub struct GainOptions {`
`15`	`15`	`pub gain: f32,`
`16`		`- pub channel_config: AudioNodeOptions,`
	`16`	`+ pub audio_node_options: AudioNodeOptions,`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`impl Default for GainOptions {`
`20`	`20`	`fn default() -> Self {`
`21`	`21`	`Self {`
`22`	`22`	`gain: 1.,`
`23`		`- channel_config: AudioNodeOptions::default(),`
	`23`	`+ audio_node_options: AudioNodeOptions::default(),`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`}`
`@@ -69,7 +69,7 @@ impl GainNode {`
`69`	`69`
`70`	`70`	`let node = GainNode {`
`71`	`71`	`registration,`
`72`		`- channel_config: options.channel_config.into(),`
	`72`	`+ channel_config: options.audio_node_options.into(),`
`73`	`73`	`gain: param,`
`74`	`74`	`};`
`75`	`75`