Jengamon/acerola_jam0_gam - Change WFOUXIQIR2QYO3IJ5UW2YHQM5F5HKH7ZXI27JEUXA5E6G5OO5EJAC

feat(fundsp): move buffer to audio-side

Created by Jengamon on March 4, 2024

WFOUXIQIR2QYO3IJ5UW2YHQM5F5HKH7ZXI27JEUXA5E6G5OO5EJAC

Dependencies

In channels

main

Change contents

Replacement in src/sfxr.rs at line 45 [7.32]

B:BD[6.286] → [5.381:482]

            Sfxr::PinkExp { amp, f } => Machine::new(pink() * amp * envelope(move |t| exp(-f * t))),

[6.286]

[5.482]

            Sfxr::PinkExp { amp, f } => {
                Machine::new(pink() * amp.min(1.0) * envelope(move |t| exp(-f * t)))
            }

Replacement in src/sfxr.rs at line 53 [7.32]

B:BD[5.625] → [5.625:688]

                pink() * amp * envelope(move |t| exp(-f * t)),

[5.625]

[5.688]

                pink() * amp.min(1.0) * envelope(move |t| exp(-f * t)),

Replacement in src/main.rs at line 204 [9.49]

B:BD[8.3452] → [8.3452:3526]

    #[asset(path = "SDJA Orbit25 - Duo (w: alixi) 2023-08-05 1306.flac")]

[8.3452]

[8.3526]

    #[asset(path = "mfvart 2023-12-19 2023-12-19 1344.flac")]

Replacement in src/main.rs at line 211 [9.49]
B:BD[8.3694] → [2.0:27]
```
        .with_volume(0.05)
```
[8.3694]
[10.354]
```
        .with_volume(0.3)
```

Insertion in src/fundsp_kira.rs at line 4 [11.58]

[11.120]

[12.538]

use generic_array::{
    functional::FunctionalSequence as _, sequence::GenericSequence, typenum::U512, ArrayLength,
    GenericArray,
};

Replacement in src/fundsp_kira.rs at line 33 [11.58]

B:BD[12.786] → [13.3389:3431]

pub type MainTrack = Track<DefaultTrack>;

[12.786]

[13.3431]

pub type DefaultBufferLength = U512;
pub type MainTrack = Track<DefaultTrack, DefaultBufferLength>;

Replacement in src/fundsp_kira.rs at line 40 [11.58]
∅:D[14.70] → [13.3491:3533]
B:BD[13.3491] → [13.3491:3533]
```
            .add_track::<DefaultTrack>();
```
[14.70]
[12.918]
```
            .add_track::<DefaultTrack, DefaultBufferLength>();
```

Replacement in src/fundsp_kira.rs at line 45 [11.58]

B:BD[15.27] → [15.27:140]

    fn add_track<T: Resource>(&mut self) -> &mut Self {
        self.add_track_with_sample_rate::<T>(DEFAULT_SR)

[15.27]

[15.140]

    fn add_track<T: Resource, N: ArrayLength>(&mut self) -> &mut Self {
        self.add_track_with_sample_rate::<T, N>(DEFAULT_SR)

Replacement in src/fundsp_kira.rs at line 49 [11.58]

B:BD[15.147] → [15.147:237]

    fn add_track_with_sample_rate<T: Resource>(&mut self, sample_rate: f64) -> &mut Self;

[15.147]

[15.237]

    fn add_track_with_sample_rate<T: Resource, N: ArrayLength>(
        &mut self,
        sample_rate: f64,
    ) -> &mut Self;

Replacement in src/fundsp_kira.rs at line 66 [11.58]

B:BD[15.270] → [15.270:403]

    fn add_track_with_sample_rate<T: Resource>(&mut self, sample_rate: f64) -> &mut Self {
        self.insert_resource(Track::<T> {

[15.270]

[15.403]

    fn add_track_with_sample_rate<T: Resource, N: ArrayLength>(
        &mut self,
        sample_rate: f64,
    ) -> &mut Self {
        self.insert_resource(Track::<T, N> {

Replacement in src/fundsp_kira.rs at line 76 [11.58]

B:BD[16.560] → [16.560:644]

            load_next_machine::<T>.in_set(FundspAudioSystemSet::PlayTypedChannels),

[16.560]

[16.644]

            load_next_machine::<T, N>.in_set(FundspAudioSystemSet::PlayTypedChannels),

Replacement in src/fundsp_kira.rs at line 81 [11.58]
B:BD[16.663] → [16.663:698]
```
fn load_next_machine<T: Resource>(
```
[16.663]
[16.698]
```
fn load_next_machine<T: Resource, N: ArrayLength>(
```
Replacement in src/fundsp_kira.rs at line 83 [11.58]
B:BD[16.745] → [16.745:778]
```
    mut track: ResMut<Track<T>>,
```
[16.745]
[14.71]
```
    mut track: ResMut<Track<T, N>>,
```

Replacement in src/fundsp_kira.rs at line 164 [11.58]

B:BD[17.1058] → [14.198:277]

    fn play<T: Resource>(&mut self, machine: &Machine, track: &mut Track<T>) {

[17.1058]

[12.2082]

    fn play<T: Resource, N: ArrayLength>(&mut self, machine: &Machine, track: &mut Track<T, N>) {

Replacement in src/fundsp_kira.rs at line 172 [11.58]

B:BD[13.3977] → [16.960:1007]

            let machined = Machined::<T>::new(

[13.3977]

[14.278]

            let machined = Machined::<T, N>::new(

Replacement in src/fundsp_kira.rs at line 189 [11.58]

B:BD[13.4327] → [13.4327:4404]

struct ChannelDetails {
    rms: Arc<AtomicU32>,
    sample: Arc<AtomicU32>,

[13.4327]

[13.4404]

struct ChannelDetails<N: ArrayLength> {
    rms: GenericArray<Arc<AtomicU32>, N>,
    samples: GenericArray<Arc<AtomicU32>, N>,

Replacement in src/fundsp_kira.rs at line 194 [11.58]
B:BD[13.4407] → [13.4407:4429]
```
impl ChannelDetails {
```
[13.4407]
[13.4429]
```
impl<N: ArrayLength> ChannelDetails<N> {
```

Replacement in src/fundsp_kira.rs at line 196 [11.58]

B:BD[13.4471] → [17.1289:1353]

        self.sample.store(sample.to_bits(), Ordering::Release);

[13.4471]

[13.4534]

        for i in 0..(N::to_usize() - 1) {
            self.samples[i].swap(
                self.samples[i + 1].load(Ordering::Acquire),
                Ordering::AcqRel,
            );
        }
        self.samples[N::to_usize() - 1].store(sample.to_bits(), Ordering::Release);

Replacement in src/fundsp_kira.rs at line 206 [11.58]

B:BD[13.4577] → [17.1354:1412]

        self.rms.store(rms.to_bits(), Ordering::Release);

[13.4577]

[13.4634]

        for i in 0..(N::to_usize() - 1) {
            self.rms[i].swap(self.rms[i + 1].load(Ordering::Acquire), Ordering::AcqRel);
        }
        self.rms[N::to_usize() - 1].store(rms.to_bits(), Ordering::Release);

Replacement in src/fundsp_kira.rs at line 212 [11.58]

B:BD[13.4641] → [13.4641:4671]

B:BD[13.4671] → [17.1413:1476]

∅:D[17.1476] → [13.4733:4769]

B:BD[13.4733] → [13.4733:4769]

    fn sample(&self) -> f32 {
        let sample_bits = self.sample.load(Ordering::Acquire);
        f32::from_bits(sample_bits)

[13.4641]

[13.4769]

    fn samples(&self) -> GenericArray<f32, N> {
        <GenericArray<_, N>>::clone(&self.samples)
            .map(|bits| f32::from_bits(bits.load(Ordering::Acquire)))

Replacement in src/fundsp_kira.rs at line 217 [11.58]

B:BD[13.4776] → [13.4776:4803]

B:BD[13.4803] → [17.1477:1534]

∅:D[17.1534] → [13.4859:4892]

B:BD[13.4859] → [13.4859:4892]

    fn rms(&self) -> f32 {
        let rms_bits = self.rms.load(Ordering::Acquire);
        f32::from_bits(rms_bits)

[13.4776]

[13.4892]

    fn rms(&self) -> GenericArray<f32, N> {
        <GenericArray<_, N>>::clone(&self.rms)
            .map(|bits| f32::from_bits(bits.load(Ordering::Acquire)))
    }
    fn empty_atomics() -> GenericArray<Arc<AtomicU32>, N> {
        GenericArray::generate(|_| Arc::new(AtomicU32::new(0.0f32.to_bits())))

Replacement in src/fundsp_kira.rs at line 227 [11.58]
B:BD[13.4901] → [13.4901:4935]
```
impl Default for ChannelDetails {
```
[13.4901]
[13.4935]
```
impl<N: ArrayLength> Default for ChannelDetails<N> {
```

Replacement in src/fundsp_kira.rs at line 230 [11.58]

B:BD[13.4977] → [13.4977:5102]

            rms: Arc::new(AtomicU32::new(0.0f32.to_bits())),
            sample: Arc::new(AtomicU32::new(0.0f32.to_bits())),

[13.4977]

[13.5102]

            rms: Self::empty_atomics(),
            samples: Self::empty_atomics(),

Replacement in src/fundsp_kira.rs at line 237 [11.58]

B:BD[13.5138] → [13.5138:5160]

B:BD[13.5196] → [13.5196:5265]

struct Trackable<T> {
    left_channel: ChannelDetails,
    right_channel: ChannelDetails,

[13.5138]

[13.5265]

struct Trackable<T, N: ArrayLength> {
    left_channel: ChannelDetails<N>,
    right_channel: ChannelDetails<N>,

Replacement in src/fundsp_kira.rs at line 243 [11.58]

B:BD[13.5297] → [13.5297:5328]

impl<T> Clone for Trackable<T>

[13.5297]

[13.5328]

impl<T, N: ArrayLength> Trackable<T, N> {
    fn buffer_length(&self) -> usize {
        N::to_usize()
    }
}
impl<T, N: ArrayLength> Clone for Trackable<T, N>

Replacement in src/fundsp_kira.rs at line 262 [11.58]
B:BD[13.5614] → [13.5614:5649]
```
impl<T> Default for Trackable<T> {
```
[13.5614]
[13.5649]
```
impl<T, N: ArrayLength> Default for Trackable<T, N> {
```

Replacement in src/fundsp_kira.rs at line 273 [11.58]

B:BD[13.6072] → [13.6072:6123]

pub struct Track<T> {
    trackable: Trackable<T>,

[13.6072]

[13.6123]

pub struct Track<T, N: ArrayLength> {
    trackable: Trackable<T, N>,

Replacement in src/fundsp_kira.rs at line 280 [11.58]
B:BD[13.6148] → [13.6148:6179]
```
impl<T> Default for Track<T> {
```
[13.6148]
[13.6179]
```
impl<T, N: ArrayLength> Default for Track<T, N> {
```
Replacement in src/fundsp_kira.rs at line 291 [11.58]
B:BD[13.6305] → [13.6305:6324]
```
impl<T> Track<T> {
```
[13.6305]
[13.6348]
```
impl<T, N: ArrayLength> Track<T, N> {
```

Replacement in src/fundsp_kira.rs at line 298 [11.58]

B:BD[13.6675] → [13.6675:6837]

    pub fn sample(&self) -> (f32, f32) {
        (
            self.trackable.left_channel.sample(),
            self.trackable.right_channel.sample(),
        )

[13.6675]

[13.6837]

    pub fn samples(&self) -> GenericArray<(f32, f32), N> {
        let left_samples = self.trackable.left_channel.samples();
        let right_samples = self.trackable.right_channel.samples();
        left_samples.zip(right_samples, |l, r| (l, r))

Replacement in src/fundsp_kira.rs at line 305 [11.58]

B:BD[13.6907] → [13.6907:7060]

    pub fn rms(&self) -> (f32, f32) {
        (
            self.trackable.left_channel.rms(),
            self.trackable.right_channel.rms(),
        )

[13.6907]

[17.1581]

    pub fn rms(&self) -> GenericArray<(f32, f32), N> {
        let left_rms = self.trackable.left_channel.rms();
        let right_rms = self.trackable.right_channel.rms();
        left_rms.zip(right_rms, |l, r| (l, r))

Insertion in src/fundsp_kira.rs at line 314 [11.58]

[16.1380]

[13.7066]


    pub fn buffer_length(&self) -> usize {
        self.trackable.buffer_length()
    }

Replacement in src/fundsp_kira.rs at line 359 [11.58]
B:BD[18.526] → [19.43:68]
```
pub struct Machined<T> {
```
[18.526]
[19.68]
```
pub struct Machined<T, N: ArrayLength> {
```
Replacement in src/fundsp_kira.rs at line 364 [11.58]
∅:D[20.217] → [13.7112:7141]
B:BD[21.1073] → [13.7112:7141]
```
    trackable: Trackable<T>,
```
[20.217]
[12.2348]
```
    trackable: Trackable<T, N>,
```
Replacement in src/fundsp_kira.rs at line 394 [11.58]
B:BD[20.636] → [19.101:121]
```
impl<T> Machined<T>
```
[20.636]
[12.2523]
```
impl<T, N: ArrayLength> Machined<T, N>
```
Replacement in src/fundsp_kira.rs at line 401 [11.58]
B:BD[19.217] → [19.217:247]
```
        track: &mut Track<T>,
```
[19.217]
[16.1746]
```
        track: &mut Track<T, N>,
```
Replacement in src/fundsp_kira.rs at line 416 [11.58]
B:BD[12.2655] → [19.307:349]
```
impl<Track> SoundData for Machined<Track>
```
[12.2655]
[12.2697]
```
impl<Track, N> SoundData for Machined<Track, N>
```
Insertion in src/fundsp_kira.rs at line 419 [11.58]
[13.7572]
[12.2733]
```
    N: ArrayLength,
```
Replacement in src/fundsp_kira.rs at line 440 [11.58]
B:BD[12.3027] → [19.350:382]
```
pub struct FundspSound<Track> {
```
[12.3027]
[19.382]
```
pub struct FundspSound<Track, N: ArrayLength> {
```
Replacement in src/fundsp_kira.rs at line 451 [11.58]
B:BD[13.7804] → [13.7804:7837]
```
    trackable: Trackable<Track>,
```
[13.7804]
[22.70]
```
    trackable: Trackable<Track, N>,
```
Replacement in src/fundsp_kira.rs at line 461 [11.58]
∅:D[4.167] → [19.415:448]
B:BD[12.3265] → [19.415:448]
```
impl<Track> FundspSound<Track> {
```
[4.167]
[17.2124]
```
impl<Track, N: ArrayLength> FundspSound<Track, N> {
```
Replacement in src/fundsp_kira.rs at line 471 [11.58]
∅:D[4.204] → [17.2356:2393]
∅:D[15.513] → [17.2356:2393]
B:BD[17.2356] → [17.2356:2393]
```
        trackable: Trackable<Track>,
```
[4.204]
[22.99]
```
        trackable: Trackable<Track, N>,
```
Replacement in src/fundsp_kira.rs at line 517 [11.58]
B:BD[12.3774] → [19.490:531]
```
impl<Track> Sound for FundspSound<Track>
```
[12.3774]
[12.3817]
```
impl<Track, N> Sound for FundspSound<Track, N>
```
Insertion in src/fundsp_kira.rs at line 520 [11.58]
[13.8054]
[12.3843]
```
    N: ArrayLength,
```
Deletion in src/debug.rs at line 1 [23.120]
B:BD[23.120] → [23.121:154]
```
use std::collections::VecDeque;
```
Deletion in src/debug.rs at line 43 [23.120]
B:BD[23.643] → [23.643:694]
```
    mut sample_pairs: Local<VecDeque<(f32, f32)>>,
```

Deletion in src/debug.rs at line 45 [23.120]

B:BD[23.698] → [23.698:738]

B:BD[23.738] → [3.0:209]

∅:D[3.209] → [23.946:952]

B:BD[23.946] → [23.946:952]

B:BD[23.952] → [3.210:270]

∅:D[3.270] → [23.952:996]

B:BD[23.952] → [23.952:996]

    const SAMPLES_TO_KEEP: usize = 512;
    let sample_pairs_len = sample_pairs.len();
    // Fill up them sample_pairs
    if sample_pairs_len < SAMPLES_TO_KEEP {
        sample_pairs.extend((sample_pairs_len..SAMPLES_TO_KEEP).map(|_| (0.0, 0.0)))
    }
    // Update main track data
    sample_pairs.pop_front();
    sample_pairs.push_back(track.sample());

Replacement in src/debug.rs at line 88 [23.120]

B:BD[23.1569] → [23.1569:1622]

            let left_wave: PlotPoints = sample_pairs

[23.1569]

[23.1622]

            let left_wave: PlotPoints = track
                .samples()

Replacement in src/debug.rs at line 95 [23.120]

B:BD[23.1921] → [23.1921:1975]

            let right_wave: PlotPoints = sample_pairs

[23.1921]

[23.1975]

            let right_wave: PlotPoints = track
                .samples()

Replacement in src/debug.rs at line 110 [23.120]

B:BD[23.2608] → [23.2608:2659]

                .include_x(SAMPLES_TO_KEEP as f64)

[23.2608]

[23.2659]

                .include_x(track.buffer_length() as f64)

Replacement in src/debug.rs at line 116 [23.120]

B:BD[23.2842] → [15.1072:1140]

            ui.label(format!("Main Track RMS: {:?}", track.rms()));

[23.2842]

[15.1140]

            let current_rms = track.rms().last().copied().unwrap_or((0.0, 0.0));
            ui.label(format!("Main Track RMS: {current_rms:?}"));

feat(fundsp): move buffer to audio-side

Dependencies

In channels

Change contents

Replacement in src/sfxr.rs at line 45 [7.32]

Replacement in src/sfxr.rs at line 53 [7.32]

Replacement in src/main.rs at line 204 [9.49]

Replacement in src/main.rs at line 211 [9.49]

Insertion in src/fundsp_kira.rs at line 4 [11.58]

Replacement in src/fundsp_kira.rs at line 33 [11.58]

Replacement in src/fundsp_kira.rs at line 40 [11.58]

Replacement in src/fundsp_kira.rs at line 45 [11.58]

Replacement in src/fundsp_kira.rs at line 49 [11.58]

Replacement in src/fundsp_kira.rs at line 66 [11.58]

Replacement in src/fundsp_kira.rs at line 76 [11.58]

Replacement in src/fundsp_kira.rs at line 81 [11.58]

Replacement in src/fundsp_kira.rs at line 83 [11.58]

Replacement in src/fundsp_kira.rs at line 164 [11.58]

Replacement in src/fundsp_kira.rs at line 172 [11.58]

Replacement in src/fundsp_kira.rs at line 189 [11.58]

Replacement in src/fundsp_kira.rs at line 194 [11.58]

Replacement in src/fundsp_kira.rs at line 196 [11.58]

Replacement in src/fundsp_kira.rs at line 206 [11.58]

Replacement in src/fundsp_kira.rs at line 212 [11.58]

Replacement in src/fundsp_kira.rs at line 217 [11.58]

Replacement in src/fundsp_kira.rs at line 227 [11.58]

Replacement in src/fundsp_kira.rs at line 230 [11.58]

Replacement in src/fundsp_kira.rs at line 237 [11.58]

Replacement in src/fundsp_kira.rs at line 243 [11.58]

Replacement in src/fundsp_kira.rs at line 262 [11.58]

Replacement in src/fundsp_kira.rs at line 273 [11.58]

Replacement in src/fundsp_kira.rs at line 280 [11.58]

Replacement in src/fundsp_kira.rs at line 291 [11.58]

Replacement in src/fundsp_kira.rs at line 298 [11.58]

Replacement in src/fundsp_kira.rs at line 305 [11.58]

Insertion in src/fundsp_kira.rs at line 314 [11.58]

Replacement in src/fundsp_kira.rs at line 359 [11.58]

Replacement in src/fundsp_kira.rs at line 364 [11.58]

Replacement in src/fundsp_kira.rs at line 394 [11.58]

Replacement in src/fundsp_kira.rs at line 401 [11.58]

Replacement in src/fundsp_kira.rs at line 416 [11.58]

Insertion in src/fundsp_kira.rs at line 419 [11.58]

Replacement in src/fundsp_kira.rs at line 440 [11.58]

Replacement in src/fundsp_kira.rs at line 451 [11.58]

Replacement in src/fundsp_kira.rs at line 461 [11.58]

Replacement in src/fundsp_kira.rs at line 471 [11.58]

Replacement in src/fundsp_kira.rs at line 517 [11.58]

Insertion in src/fundsp_kira.rs at line 520 [11.58]

Deletion in src/debug.rs at line 1 [23.120]

Deletion in src/debug.rs at line 43 [23.120]

Deletion in src/debug.rs at line 45 [23.120]

Replacement in src/debug.rs at line 88 [23.120]

Replacement in src/debug.rs at line 95 [23.120]

Replacement in src/debug.rs at line 110 [23.120]

Replacement in src/debug.rs at line 116 [23.120]