Jengamon/acerola_jam0_gam - Change LJJL6IBEQCCIVNJHDMXA7HBVI3CVROFUSFTXB3CSARCMJFM25Z5AC

fix: allow custom noise floor

Created by Jengamon on March 3, 2024

LJJL6IBEQCCIVNJHDMXA7HBVI3CVROFUSFTXB3CSARCMJFM25Z5AC

Dependencies

In channels

main

Change contents

Replacement in src/main.rs at line 216 [4.49]

B:BD[3.263] → [3.263:291]

B:BD[3.291] → [5.0:220]

∅:D[5.220] → [3.482:497]

B:BD[3.482] → [3.482:497]

B:BD[3.497] → [5.221:281]

∅:D[5.281] → [3.497:508]

B:BD[3.497] → [3.497:508]

        fundsp_output.play(
            &fundsp_kira::Machine {
                machine: pink() * 0.2 * envelope(|t| exp(-0.1 * t)),
                // machine: pink() * 0.5 * envelope(|t| exp(-10.0 * t)),
                // machine: pink() * 0.2,
            },
            fundsp_kira::AudioNodeSettings { ..default() },
        );

[3.263]

[3.508]

        fundsp_output.play(&fundsp_kira::Machine::new(
            pink() * 0.2 * envelope(|t| exp(-0.1 * t)),
            // pink() * 0.5 * envelope(|t| exp(-10.0 * t)),
            // pink() * 0.2,
        ));

Replacement in src/fundsp_kira.rs at line 91 [6.58]

B:BD[3.1982] → [5.347:499]

    pub(crate) fn play<T: AudioUnit32 + Clone + 'static>(
        &mut self,
        machine: &Machine<T>,
        settings: AudioNodeSettings,
    ) {

[3.1982]

[3.2082]

    pub(crate) fn play<T: AudioUnit32 + Clone + 'static>(&mut self, machine: &Machine<T>) {

Replacement in src/fundsp_kira.rs at line 94 [6.58]

B:BD[3.2157] → [5.500:577]

                .play(Machined::<T>::new(machine.machine.clone(), settings))

[3.2157]

[3.2223]

                .play(Machined::<T>::new(
                    machine.machine.clone(),
                    MachinedSettings {
                        output: default(),
                        noise_floor: machine.noise_floor,
                    },
                ))

Insertion in src/fundsp_kira.rs at line 110 [6.58]

[5.698]

[3.2266]

    /// The desired noise floor (RMS)
    pub noise_floor: f32,
}
impl<T: AudioUnit32 + 'static> Machine<T> {
    #[allow(dead_code)]
    pub const DEFAULT_NOISE_FLOOR: f32 = 0.001;
    #[allow(dead_code)]
    pub fn new(machine: T) -> Self {
        Self::with_noise_floor(machine, Self::DEFAULT_NOISE_FLOOR)
    }
    pub fn with_noise_floor(machine: T, noise_floor: f32) -> Self {
        Self {
            machine,
            noise_floor,
        }
    }

Replacement in src/fundsp_kira.rs at line 155 [6.58]
B:BD[3.2315] → [3.2315:2348]
```
    settings: AudioNodeSettings,
```
[3.2315]
[3.2348]
```
    settings: MachinedSettings,
```

Replacement in src/fundsp_kira.rs at line 160 [6.58]

B:BD[3.2384] → [3.2384:2456]

pub struct AudioNodeSettings {
    pub output: kira::OutputDestination,

[3.2384]

[3.2492]

struct MachinedSettings {
    output: kira::OutputDestination,
    noise_floor: f32,

Replacement in src/fundsp_kira.rs at line 169 [6.58]

B:BD[3.2551] → [3.2551:2614]

    pub fn new(node: T, settings: AudioNodeSettings) -> Self {

[3.2551]

[3.2614]

    fn new(node: T, settings: MachinedSettings) -> Self {

Replacement in src/fundsp_kira.rs at line 190 [6.58]
B:BD[3.3078] → [3.3078:3111]
```
    settings: AudioNodeSettings,
```
[3.3078]
[3.3134]
```
    settings: MachinedSettings,
```

Replacement in src/fundsp_kira.rs at line 201 [6.58]

B:BD[3.3326] → [3.3326:3389]

    pub fn new(node: T, settings: AudioNodeSettings) -> Self {

[3.3326]

[3.3389]

    fn new(node: T, settings: MachinedSettings) -> Self {

Replacement in src/fundsp_kira.rs at line 240 [6.58]

B:BD[3.4625] → [2.0:47]

∅:D[2.47] → [3.4672:4755]

B:BD[3.4672] → [3.4672:4755]

        trace!("RMS: {left_rms} {right_rms}");
        // NOTE This is empirical rn.
        const NOISE_FLOOR_RMS: f32 = 0.001;

[3.4625]

[5.1784]

        let noise_floor = self.settings.noise_floor;
        trace!("RMS: {left_rms} {right_rms} NF {noise_floor}");

Replacement in src/fundsp_kira.rs at line 245 [6.58]

B:BD[5.1907] → [5.1907:1998]

        let below_noise_floor = left_rms < NOISE_FLOOR_RMS && right_rms < NOISE_FLOOR_RMS;

[5.1907]

[3.4755]

        let below_noise_floor = left_rms < noise_floor && right_rms < noise_floor;