From 2d1b989880d0cf008de9a1ffa9677b037a8cd242 Mon Sep 17 00:00:00 2001
From: Weird Constructor <weirdconstructor@gmail.com>
Date: Wed, 20 Jul 2022 05:25:09 +0200
Subject: [PATCH] Refactored Sampl

---
 src/dsp/node_sampl.rs | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/dsp/node_sampl.rs b/src/dsp/node_sampl.rs
index 0fc9ca1..ce51506 100644
--- a/src/dsp/node_sampl.rs
+++ b/src/dsp/node_sampl.rs
@@ -2,7 +2,7 @@
 // This file is a part of HexoDSP. Released under GPL-3.0-or-later.
 // 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::{DspNode, LedPhaseVals, NodeContext, NodeId, ProcBuf, SAtom};
 use crate::nodes::{NodeAudioContext, NodeExecContext};
@@ -142,33 +142,23 @@ be provided on the 'trig' input port. The 'trig' input also works in
 impl Sampl {
     #[allow(clippy::many_single_char_names)]
     #[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();
         if sd_len < 1 {
             return 0.0;
         }
 
-        let j = self.phase.floor() as usize % sd_len;
-        let i = ((sd_len - 1) - j);
-
+        let i = self.phase.floor() as usize % sd_len;
         let f = self.phase.fract();
-        self.phase = j 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;
+        self.phase = i 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)
     }
 
@@ -256,11 +246,8 @@ impl Sampl {
                 // that is used for looking up the sample from the audio data.
                 let sample_idx = self.phase.floor() as usize;
 
-                let mut s = if reverse {
-                    self.next_sample_rev(sr_factor, playback_speed as f64, sample_slice)
-                } else {
-                    self.next_sample(sr_factor, playback_speed as f64, sample_slice)
-                };
+                let mut s =
+                    self.next_sample(sr_factor, playback_speed as f64, sample_slice, reverse);
 
                 if declick {
                     let samples_to_end = sample_slice.len() - sample_idx;