move TCP effects to subpackage, move cassette player to subpackage, fix macros

Author: l-Luna

Cargo.lock

@@ -7,12 +7,9 @@ edition = "2024"
 crate-type = ["dylib"]
 
 [workspace]
-members = ["tester"]
+members = ["tester", "tcp_effects", "cassette_player"]
 
 [dependencies]
-rand = "0.9.0"
-circular-buffer = "1.1.0"
-realfft = "3.4.0"
 hound = "3.5.1"
 
 [build-dependencies]

Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "cassette_player"
+version = "0.1.0"
+edition = "2024"
+
+[lib]
+crate-type = ["dylib"]
+
+[dependencies]
+scamble = { path = ".." }
+circular-buffer = "1.1.0"

cassette_player/Cargo.toml

@@ -1,7 +1,7 @@
-use crate::dsp::signal::{Signal, SignalConst, SignalMut};
-use crate::dsp::{Dsp, DspType, Parameter, ParameterType};
+use scamble::dsp::signal::{Signal, SignalConst, SignalMut};
+use scamble::dsp::{Dsp, DspType, Parameter, ParameterType};
+use scamble::dsp::decode::decode_into;
 use circular_buffer::CircularBuffer;
-use crate::dsp::decode::decode_into;
 
 #[derive(Copy, Clone)]
 struct TrailingNote {

src/effects/cassette_player.rs cassette_player/src/cassette_player.rssrc/effects/cassette_player.rs renamed to cassette_player/src/cassette_player.rs

@@ -0,0 +1,10 @@
+#![feature(macro_metavar_expr)]
+#![feature(macro_metavar_expr_concat)]
+
+use crate::cassette_player::CassettePlayer;
+
+use scamble::expose_dsp;
+
+pub mod cassette_player;
+
+expose_dsp!(CassettePlayer);

cassette_player/src/lib.rs

@@ -1,7 +1,7 @@
 use crate::raw_bindings::*;
 use crate::raw_bindings::FMOD_DSP_PARAMETER_DATA_TYPE::*;
 use crate::raw_bindings::FMOD_RESULT::{FMOD_ERR_DSP_DONTPROCESS, FMOD_ERR_DSP_SILENCE, FMOD_ERR_INVALID_PARAM, FMOD_ERR_PLUGIN, FMOD_OK};
-pub(crate) use crate::dsp::{Dsp, DspType, ParameterType, ProcessResult};
+pub use crate::dsp::{Dsp, DspType, ParameterType, ProcessResult};
 use crate::dsp::signal::{SignalConst, SignalMut};
 use std::{alloc, panic, ptr};
 use std::alloc::Layout;
@@ -15,8 +15,8 @@ use std::str::FromStr;
 macro_rules! expose_dsp {
     ($t:tt) => {
         const _: () = {
-            use crate::interop;
-            use crate::raw_bindings::FMOD_DSP_DESCRIPTION;
+            use scamble::dsp::interop;
+            use $crate::raw_bindings::FMOD_DSP_DESCRIPTION;
             use core::mem::MaybeUninit;
 
             #[allow(non_snake_case)]
@@ -47,11 +47,11 @@ macro_rules! expose_dsp_list {
         const _: () = {
             use core::mem::MaybeUninit;
             use core::ptr;
-            use crate::dsp::interop;
-            use crate::raw_bindings::FMOD_DSP_DESCRIPTION;
-            use crate::raw_bindings::FMOD_PLUGINLIST;
-            use crate::raw_bindings::FMOD_PLUGINTYPE::FMOD_PLUGINTYPE_DSP;
-            use crate::raw_bindings::FMOD_PLUGINTYPE::FMOD_PLUGINTYPE_MAX;
+            use $crate::dsp::interop;
+            use $crate::raw_bindings::FMOD_DSP_DESCRIPTION;
+            use $crate::raw_bindings::FMOD_PLUGINLIST;
+            use $crate::raw_bindings::FMOD_PLUGINTYPE::FMOD_PLUGINTYPE_DSP;
+            use $crate::raw_bindings::FMOD_PLUGINTYPE::FMOD_PLUGINTYPE_MAX;
 
             $(
                 #[allow(non_upper_case_globals)]

src/dsp/interop.rs

@@ -99,7 +99,7 @@ impl<'a> SignalMut<'a> {
         self.data.fill(v);
     }
 
-    pub(crate) fn samples_mut(&mut self) -> &mut [f32] {
+    pub fn samples_mut(&mut self) -> &mut [f32] {
         self.data
     }
 }

src/dsp/signal.rs

@@ -1,22 +1,13 @@
-#![feature(macro_metavar_expr)]
-#![feature(portable_simd)]
 #![feature(panic_payload_as_str)]
+#![feature(macro_metavar_expr)]
 #![feature(macro_metavar_expr_concat)]
 
-use effects::fantasy::Fantasy;
-use effects::noise_reduction::NoiseReduction;
-use effects::vocoder::Vocoder;
-use effects::cassette_player::CassettePlayer;
-
 #[cfg(feature = "fmod_bindings")]
 pub mod fmod;
 #[cfg(all(test, feature = "fmod_bindings"))]
 pub mod simulate;
 
 pub mod dsp;
-pub mod effects;
 pub mod raw_bindings;
 pub mod result;
-pub mod data;
-
-expose_dsp_list!(NoiseReduction, Fantasy, Vocoder, CassettePlayer);
+pub mod data;

src/lib.rs

@@ -1,5 +1,5 @@
+/*
 use crate::dsp::interop;
-use crate::effects::{click_simulator_2000, windy};
 use crate::fmod;
 use crate::raw_bindings::FMOD_RESULT::FMOD_OK;
 use crate::raw_bindings::{FMOD_DEBUG_FLAGS, FMOD_DEBUG_MODE, FMOD_Debug_Initialize, FMOD_RESULT};
@@ -64,3 +64,4 @@ extern "C" fn fmod_print_callback(
     }
     FMOD_OK
 }
+*/

src/simulate.rs

@@ -0,0 +1,13 @@
+[package]
+name = "tcp_effects"
+version = "0.1.0"
+edition = "2024"
+
+[lib]
+crate-type = ["dylib"]
+
+[dependencies]
+scamble = { path = ".." }
+rand = "0.9.0"
+circular-buffer = "1.1.0"
+realfft = "3.4.0"