sample => dasp

coopersimon · Nov 14, 2020 · 1de511d · 1de511d
1 parent 17fdfa6
commit 1de511d
Show file tree

Hide file tree

Showing 5 changed files with 136 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/oxide-7/Cargo.toml b/oxide-7/Cargo.toml
@@ -14,7 +14,10 @@ path = "src/lib.rs"
 bitflags = "1.1.0"
 crossbeam-channel = "0.4.2"
 fixed = "0.5.4"
-sample = "0.10"
+
+[dependencies.dasp]
+version = "0.11"
+features = ["interpolate", "interpolate-sinc", "ring_buffer", "signal"]
 
 [features]
 debug = []
diff --git a/oxide-7/src/audio/dsp/mod.rs b/oxide-7/src/audio/dsp/mod.rs
@@ -13,7 +13,7 @@ mod voice;
 
 use bitflags::bitflags;
 use crossbeam_channel::Sender;
-use sample::frame::{
+use dasp::frame::{
     Frame,
     Stereo
 };
@@ -99,7 +99,7 @@ impl DSP {
 
             echo_buffer_size:   0,
 
-            fir_buffer:         [Stereo::equilibrium(); 8],
+            fir_buffer:         [Stereo::EQUILIBRIUM; 8],
             fir_buffer_index:   0,
 
             noise_level:        -0x4000,
@@ -227,7 +227,7 @@ impl DSP {
         let echo = self.generate_echo(ram, echo_left as i16, echo_right as i16);
 
         let frame = if self.is_mute() {
-            Stereo::equilibrium()
+            Stereo::EQUILIBRIUM
         } else {
             let mut left = clamp!((main_left * (self.regs.main_vol_left as i32)) >> 7, MIN, MAX);
             let mut right = clamp!((main_right * (self.regs.main_vol_right as i32)) >> 7, MIN, MAX);
@@ -276,7 +276,7 @@ impl DSP {
     fn calculate_fir(&mut self, new_sample: Stereo<i16>) -> Stereo<i16> {
         self.fir_buffer[self.fir_buffer_index] = new_sample;
 
-        let out = (0..8).fold(Stereo::equilibrium(), |acc: Stereo<i32>, i| {
+        let out = (0..8).fold(Stereo::EQUILIBRIUM, |acc: Stereo<i32>, i| {
             let index = self.fir_buffer_index.wrapping_sub(7 - i) & 7;
             let buffer_sample = self.fir_buffer[index];
             let fir_coef = self.regs.echo_fir_coefs[i] as i32;

diff --git a/oxide-7/src/audio/mod.rs b/oxide-7/src/audio/mod.rs
@@ -11,7 +11,7 @@ use crossbeam_channel::{
     Receiver
 };
 
-use sample::frame::Stereo;
+use dasp::frame::Stereo;
 
 use crate::constants::timing;
 

diff --git a/oxide-7/src/audio/resampler.rs b/oxide-7/src/audio/resampler.rs
@@ -1,10 +1,13 @@
 // Module that resamples from 32_000 to the output sample rate.
 use crossbeam_channel::Receiver;
-use sample::{
+use dasp::{
     frame::{Frame, Stereo},
-    interpolate::{Converter, Sinc},
+    interpolate::sinc::Sinc,
     ring_buffer::Fixed,
-    signal::Signal
+    signal::{
+        interpolate::Converter,
+        Signal,
+    }
 };
 
 pub struct Resampler {
@@ -13,7 +16,7 @@ pub struct Resampler {
 
 impl Resampler {
     pub fn new(receiver: Receiver<super::SamplePacket>, target_sample_rate: f64) -> Self {
-        let sinc = Sinc::new(Fixed::from([Stereo::equilibrium(); 2]));
+        let sinc = Sinc::new(Fixed::from([Stereo::EQUILIBRIUM; 2]));
         Resampler {
             converter: Source::new(receiver).from_hz_to_hz(sinc, 32_000.0, target_sample_rate)
         }