From af6f09e21e46fa6fd3990862a69efb52813c378a Mon Sep 17 00:00:00 2001 From: Grant Shangreaux Date: Fri, 3 Dec 2021 22:24:26 -0600 Subject: Add: Partial implementation to refactor Instrument --- klangfarbrs/src/lib.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'klangfarbrs/src/lib.rs') diff --git a/klangfarbrs/src/lib.rs b/klangfarbrs/src/lib.rs index 7cdb214..b0b9dc1 100644 --- a/klangfarbrs/src/lib.rs +++ b/klangfarbrs/src/lib.rs @@ -22,9 +22,13 @@ use osc::{Osc, Waveform}; pub mod envelope; use envelope::Envelope; +mod partial; +use partial::Partial; + mod instrument; use instrument::Instrument; + mod utils; /// Aliasing some types to distinguish various audio properties. @@ -75,7 +79,7 @@ impl MonoSynth { let sprt = 48000.0; Self { - instrument: Instrument{osc_bank: vec![Osc::new(freq, sprt), Osc::new(400.0, sprt)], envelope: Envelope::new(30, 500, 0.5, 1000, sprt)}, + instrument: Instrument::new(freq, vec![1.0, 0.909], sprt), sample_rate: sprt, frequency: freq, apply_bend: false, @@ -202,7 +206,7 @@ impl MonoSynth { #[export] fn trigger(&mut self, _owner: &Node, ) { - self.instrument.envelope = Envelope::new(self.attack, self.decay, self.sustain, self.release, self.sample_rate); + () } #[export] -- cgit v1.2.3