Add next module for new data-oriented API design

examples/ease.rs

@@ -0,0 +1,19 @@
+use fon::{chan::Ch16, Audio, Frame};
+use twang::next::{Synth, Wave};
+
+mod wav;
+
+fn main() {
+    // Define waveform
+    const RAMP: Wave = Wave::sig(440.0).ramp(Wave::MIN);
+
+    // Initialize audio, and create synthesizer
+    let mut audio = Audio::<Ch16, 2>::with_silence(48_000, 48_000 * 5);
+    let mut synth = Synth::new(RAMP);
+
+    // Synthesize 5 seconds of audio
+    synth.stream(audio.sink(), &[]);
+
+    // Write synthesized audio to WAV file
+    wav::write(audio, "ease.wav").expect("Failed to write WAV file");
+}

examples/ramp.rs

@@ -0,0 +1,19 @@
+use fon::{chan::Ch16, Audio, Frame};
+use twang::next::{Synth, Wave};
+
+mod wav;
+
+fn main() {
+    // Define waveform
+    const RAMP: Wave = Wave::sig(440.0).ramp(Wave::MAX);
+
+    // Initialize audio, and create synthesizer
+    let mut audio = Audio::<Ch16, 2>::with_silence(48_000, 48_000 * 5);
+    let mut synth = Synth::new(RAMP);
+
+    // Synthesize 5 seconds of audio
+    synth.stream(audio.sink(), &[]);
+
+    // Write synthesized audio to WAV file
+    wav::write(audio, "ramp.wav").expect("Failed to write WAV file");
+}

examples/rectangle.rs

@@ -0,0 +1,19 @@
+use fon::{chan::Ch16, Audio, Frame};
+use twang::next::{Synth, Wave};
+
+mod wav;
+
+fn main() {
+    // Define waveform
+    const RECT: Wave = Wave::sig(440.0).rect(&Wave::sig(0.5));
+
+    // Initialize audio, and create synthesizer
+    let mut audio = Audio::<Ch16, 2>::with_silence(48_000, 48_000 * 5);
+    let mut synth = Synth::new(RECT);
+
+    // Synthesize 5 seconds of audio
+    synth.stream(audio.sink(), &[]);
+
+    // Write synthesized audio to WAV file
+    wav::write(audio, "rectangle.wav").expect("Failed to write WAV file");
+}

examples/sawtooth.rs

@@ -1,30 +1,19 @@
 use fon::{chan::Ch16, Audio, Frame};
-use twang::osc::Sawtooth;
-use twang::Synth;
+use twang::next::{Synth, Wave};
 
 mod wav;
 
-// State of the synthesizer.
-struct Processors {
-    saw: Sawtooth,
-}
-
 fn main() {
-    // Initialize audio
+    // Define waveform
+    const SAW: Wave = Wave::sig(440.0).saw();
+
+    // Initialize audio, and create synthesizer
     let mut audio = Audio::<Ch16, 2>::with_silence(48_000, 48_000 * 5);
-    // Create audio processors
-    let proc = Processors {
-        saw: Sawtooth::new(),
-    };
-    // Build synthesis algorithm
-    let mut synth = Synth::new(proc, |proc, frame: Frame<_, 2>| {
-        // Calculate the next sample for each processor
-        let saw = proc.saw.step(440.0);
-        // Pan the generated audio center
-        frame.pan(saw, 0.0)
-    });
+    let mut synth = Synth::new(SAW);
+
     // Synthesize 5 seconds of audio
-    synth.stream(audio.sink());
+    synth.stream(audio.sink(), &[]);
+
     // Write synthesized audio to WAV file
     wav::write(audio, "sawtooth.wav").expect("Failed to write WAV file");
 }

examples/sine.rs

@@ -1,30 +1,20 @@
 use fon::{chan::Ch16, Audio, Frame};
-use twang::osc::Sine;
-use twang::Synth;
+use twang::next::{Synth, Wave};
 
 mod wav;
 
-// State of the synthesizer.
-struct Processors {
-    sine: Sine,
-}
-
 fn main() {
-    // Initialize audio
+    // Define waveform
+    const SINE: Wave = Wave::sig(440.0).sine();
+
+    // Initialize audio, and create synthesizer
     let mut audio = Audio::<Ch16, 2>::with_silence(48_000, 48_000 * 5);
-    // Create audio processors
-    let proc = Processors { sine: Sine::new() };
-    // Build synthesis algorithm
-    let mut synth = Synth::new(proc, |proc, frame: Frame<_, 2>| {
-        // Calculate the next sample for each processor
-        let sine = proc.sine.step(440.0);
-        // Pan the generated audio center
-        frame.pan(sine, 0.0)
-    });
+    let mut synth = Synth::new(SINE);
+
     // Synthesize 5 seconds of audio
-    synth.stream(audio.sink());
-    // Plot synthesized audio
+    synth.stream(audio.sink(), &[]);
+
+    // Plot synthesized audio, and write to a WAV file
     // plot::write(&audio);
-    // Write synthesized audio to WAV file
     wav::write(audio, "sine.wav").expect("Failed to write WAV file");
 }

examples/square.rs

@@ -1,30 +1,19 @@
 use fon::{chan::Ch16, Audio, Frame};
-use twang::osc::Pulse;
-use twang::Synth;
+use twang::next::{Synth, Wave};
 
 mod wav;
 
-// State of the synthesizer.
-struct Processors {
-    pulse: Pulse,
-}
-
 fn main() {
-    // Initialize audio
+    // Define waveform
+    const SQUARE: Wave = Wave::sig(440.0).sq();
+
+    // Initialize audio, and create synthesizer
     let mut audio = Audio::<Ch16, 2>::with_silence(48_000, 48_000 * 5);
-    // Create audio processors
-    let proc = Processors {
-        pulse: Pulse::new(),
-    };
-    // Build synthesis algorithm
-    let mut synth = Synth::new(proc, |proc, frame: Frame<_, 2>| {
-        // Calculate the next sample for each processor
-        let square = proc.pulse.step(440.0, Default::default());
-        // Pan the generated audio center
-        frame.pan(square, 0.0)
-    });
+    let mut synth = Synth::new(SQUARE);
+
     // Synthesize 5 seconds of audio
-    synth.stream(audio.sink());
+    synth.stream(audio.sink(), &[]);
+
     // Write synthesized audio to WAV file
     wav::write(audio, "square.wav").expect("Failed to write WAV file");
 }

examples/trap.rs

@@ -0,0 +1,19 @@
+use fon::{chan::Ch16, Audio, Frame};
+use twang::next::{Synth, Wave};
+
+mod wav;
+
+fn main() {
+    // Define waveform
+    const TRAP: Wave = Wave::sig(440.0).trap(&Wave::sig(0.5), Wave::ZERO);
+
+    // Initialize audio, and create synthesizer
+    let mut audio = Audio::<Ch16, 2>::with_silence(48_000, 48_000 * 5);
+    let mut synth = Synth::new(TRAP);
+
+    // Synthesize 5 seconds of audio
+    synth.stream(audio.sink(), &[]);
+
+    // Write synthesized audio to WAV file
+    wav::write(audio, "trap.wav").expect("Failed to write WAV file");
+}

examples/triangle.rs

@@ -1,30 +1,19 @@
 use fon::{chan::Ch16, Audio, Frame};
-use twang::osc::Triangle;
-use twang::Synth;
+use twang::next::{Synth, Wave};
 
 mod wav;
 
-// State of the synthesizer.
-struct Processors {
-    triangle: Triangle,
-}
-
 fn main() {
-    // Initialize audio
+    // Define waveform
+    const TRIANGLE: Wave = Wave::sig(440.0).trap(Wave::ZERO, Wave::MAX);
+
+    // Initialize audio, and create synthesizer
     let mut audio = Audio::<Ch16, 2>::with_silence(48_000, 48_000 * 5);
-    // Create audio processors
-    let proc = Processors {
-        triangle: Triangle::new(),
-    };
-    // Build synthesis algorithm
-    let mut synth = Synth::new(proc, |proc, frame: Frame<_, 2>| {
-        // Calculate the next sample for each processor
-        let triangle = proc.triangle.step(440.0);
-        // Pan the generated audio center
-        frame.pan(triangle, 0.0)
-    });
+    let mut synth = Synth::new(TRIANGLE);
+
     // Synthesize 5 seconds of audio
-    synth.stream(audio.sink());
+    synth.stream(audio.sink(), &[]);
+
     // Write synthesized audio to WAV file
     wav::write(audio, "triangle.wav").expect("Failed to write WAV file");
 }

src/file.rs

@@ -10,8 +10,8 @@
 //! Twang synthesis file format
 
 use alloc::vec::Vec;
+use fon::chan::{Ch32, Channel};
 use fon::{Audio, Sink};
-use fon::chan::{Channel, Ch32};
 
 /*
 /// A twang synthesis operation
@@ -20,7 +20,7 @@ enum Op {
     Pop,
     /// Push value onto audio stack
     Psh(Ch32),
-    /// Swap by index 
+    /// Swap by index
     Swp(u32),
     /// Swap and pop by index
     Sap(u32),
@@ -92,7 +92,7 @@ enum Node {
     WaveT(Table, Const),
     WaveC(Table, Chunk),
     WaveV(Table, Value),
-    
+
     WaypointT(Table, Const),
     WaypointC(Table, Chunk),
     WaypointV(Table, Value),
@@ -107,7 +107,6 @@ enum Node {
     BezierVC(Value, Chunk),
     BezierVV(Value, Value),
 
-
     /// Frequency Counter
     ///
     /// A frequency counter is a sawtooth wave.
@@ -175,7 +174,6 @@ mod seal {
 
 use self::seal::{Any, Sampler};
 
-
 /// Builder for a synth
 ///
 /// Inputs -> Program -> Output
@@ -190,7 +188,8 @@ pub struct SynthBuilder {
 impl SynthBuilder {
     /// Add chunked audio from an external source
     pub fn mix_source(mut self, chunk: Chunk) -> Self {
-        self.input_buffers.resize((chunk.0 + 1).try_into().unwrap(), [Ch32::default(); 32]);
+        self.input_buffers
+            .resize((chunk.0 + 1).try_into().unwrap(), [Ch32::default(); 32]);
         self.nodes.push(Node::Source(chunk));
         self
     }
@@ -199,17 +198,19 @@ impl SynthBuilder {
     ///
     /// A line wave is a horizontal line, silence to human ears.
     pub fn mix_line(mut self, value: Value) -> Self {
-        self.input_samples.resize((value.0 + 1).try_into().unwrap(), 0.0);
+        self.input_samples
+            .resize((value.0 + 1).try_into().unwrap(), 0.0);
         self.nodes.push(Node::Line(value));
         self
     }
-    
+
     /// Add wavetable
     ///
     /// A wave table is a collection of samples that are slowed down or sped up
     /// to make the pitch higher or lower.
     pub fn mix_wave(mut self, table: Table, freq: impl Sampler) -> Self {
-        self.input_wtables.resize((table.0 + 1).try_into().unwrap(), Vec::new());
+        self.input_wtables
+            .resize((table.0 + 1).try_into().unwrap(), Vec::new());
         self.nodes.push(match freq.to_any() {
             Any::Value(x) => Node::WaveV(table, x),
             Any::Chunk(x) => Node::WaveC(table, x),
@@ -223,7 +224,8 @@ impl SynthBuilder {
     /// A ways table is almost the same thing as a wavetable, except allows
     /// aliasing.
     pub fn mix_ways(mut self, table: Table, freq: impl Sampler) -> Self {
-        self.input_wtables.resize((table.0 + 1).try_into().unwrap(), Vec::new());
+        self.input_wtables
+            .resize((table.0 + 1).try_into().unwrap(), Vec::new());
         self.nodes.push(match freq.to_any() {
             Any::Value(x) => Node::WaypointV(table, x),
             Any::Chunk(x) => Node::WaypointC(table, x),
@@ -257,9 +259,6 @@ impl SynthBuilder {
     }
 }
 
-
-
-
 /*
 #[derive(Debug)]
 struct EnvelopeComponent {

src/lib.rs

@@ -114,6 +114,8 @@ pub mod noise;
 pub mod ops;
 pub mod osc;
 // FIXME
-// pub mod file;
+pub mod file;
+// FIXME
+pub mod next;
 
 pub use synth::Synth;