tuxmain/HexoDSP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactored Sampl

Browse source
This commit is contained in:
Weird Constructor 2022-07-20 05:25:09 +02:00
parent 7c26d1971f
commit 2d1b989880
1 changed files with 13 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/dsp/node_sampl.rs
View file

@ -2,7 +2,7 @@
// This file is a part of HexoDSP. Released under GPL-3.0-or-later. // This file is a part of HexoDSP. Released under GPL-3.0-or-later.
// See README.md and COPYING for details. // See README.md and COPYING for details.
use super::helpers::{Trigger, cubic_interpolate}; use super::helpers::{cubic_interpolate, Trigger};
use crate::dsp::{at, denorm, denorm_offs, inp, out}; //, inp, denorm, denorm_v, inp_dir, at}; use crate::dsp::{at, denorm, denorm_offs, inp, out}; //, inp, denorm, denorm_v, inp_dir, at};
use crate::dsp::{DspNode, LedPhaseVals, NodeContext, NodeId, ProcBuf, SAtom}; use crate::dsp::{DspNode, LedPhaseVals, NodeContext, NodeId, ProcBuf, SAtom};
use crate::nodes::{NodeAudioContext, NodeExecContext}; use crate::nodes::{NodeAudioContext, NodeExecContext};
@ -142,33 +142,23 @@ be provided on the 'trig' input port. The 'trig' input also works in
impl Sampl { impl Sampl {
#[allow(clippy::many_single_char_names)] #[allow(clippy::many_single_char_names)]
#[inline] #[inline]
fn next_sample_rev(&mut self, sr_factor: f64, speed: f64, sample_data: &[f32]) -> f32 { fn next_sample(
&mut self,
sr_factor: f64,
speed: f64,
sample_data: &[f32],
reverse: bool,
) -> f32 {
let sd_len = sample_data.len(); let sd_len = sample_data.len();
if sd_len < 1 { if sd_len < 1 {
return 0.0; return 0.0;
} }
let j = self.phase.floor() as usize % sd_len; let i = self.phase.floor() as usize % sd_len;
let i = ((sd_len - 1) - j);
let f = self.phase.fract(); let f = self.phase.fract();
self.phase = j as f64 + f + sr_factor * speed; self.phase = i as f64 + f + sr_factor * speed;
cubic_interpolate(&sample_data[..], sd_len, i, (1.0 - f) as f32)
}
#[allow(clippy::many_single_char_names)]
#[inline]
fn next_sample(&mut self, sr_factor: f64, speed: f64, sample_data: &[f32]) -> f32 {
let sd_len = sample_data.len();
if sd_len < 1 {
return 0.0;
}
let i = self.phase.floor() as usize;
let f = self.phase.fract();
self.phase = (i % sd_len) as f64 + f + sr_factor * speed;
let (i, f) = if reverse { (((sd_len - 1) - i), 1.0 - f) } else { (i, f) };
cubic_interpolate(&sample_data[..], sd_len, i, f as f32) cubic_interpolate(&sample_data[..], sd_len, i, f as f32)
} }
@ -256,11 +246,8 @@ impl Sampl {
// that is used for looking up the sample from the audio data. // that is used for looking up the sample from the audio data.
let sample_idx = self.phase.floor() as usize; let sample_idx = self.phase.floor() as usize;
let mut s = if reverse { let mut s =
self.next_sample_rev(sr_factor, playback_speed as f64, sample_slice) self.next_sample(sr_factor, playback_speed as f64, sample_slice, reverse);
} else {
self.next_sample(sr_factor, playback_speed as f64, sample_slice)
};
if declick { if declick {
let samples_to_end = sample_slice.len() - sample_idx; let samples_to_end = sample_slice.len() - sample_idx;