Remove EnvelopeSpec from magnetron

Woyten · Jan 18, 2025 · 02a6a42 · 02a6a42
1 parent f9dad77
commit 02a6a42
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/magnetron/src/lib.rs b/magnetron/src/lib.rs
@@ -1,6 +1,5 @@
 pub mod automation;
 pub mod buffer;
-pub mod envelope;
 pub mod stage;
 
 use buffer::{BufferWriter, WaveformBuffer};

diff --git a/microwave/src/assets.rs b/microwave/src/assets.rs
@@ -1,5 +1,4 @@
 use bevy::prelude::*;
-use magnetron::envelope::EnvelopeSpec;
 use tune_cli::shared::midi::TuningMethod;
 
 use crate::{
@@ -9,6 +8,7 @@ use crate::{
     fluid::FluidSpec,
     magnetron::{
         effects::EffectSpec,
+        envelope::EnvelopeSpec,
         filter::{FilterSpec, FilterType},
         noise::{NoiseSpec, NoiseType},
         oscillator::{ModOscillatorSpec, Modulation, OscillatorSpec, OscillatorType},

diff --git a/magnetron/src/envelope.rs → microwave/src/magnetron/envelope.rs b/magnetron/src/envelope.rs → microwave/src/magnetron/envelope.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use magnetron::{
     automation::{AutomatableParam, Automated, AutomationFactory},
     buffer::BufferIndex,
     stage::{Stage, StageActivity},

diff --git a/microwave/src/magnetron/mod.rs b/microwave/src/magnetron/mod.rs
@@ -16,6 +16,7 @@ use self::{
 mod util;
 
 pub mod effects;
+pub mod envelope;
 pub mod filter;
 pub mod noise;
 pub mod oscillator;
@@ -276,11 +277,9 @@ mod tests {
     use std::{collections::HashMap, f64::consts::TAU, iter};
 
     use assert_approx_eq::assert_approx_eq;
-    use magnetron::{
-        automation::QueryInfo, envelope::EnvelopeSpec, stage::StageActivity, Magnetron,
-    };
+    use magnetron::{automation::QueryInfo, stage::StageActivity, Magnetron};
 
-    use crate::profile::WaveformAutomatableValue;
+    use crate::{magnetron::envelope::EnvelopeSpec, profile::WaveformAutomatableValue};
 
     use super::{
         source::{LfSource, LfSourceExpr},

diff --git a/microwave/src/magnetron/waveform.rs b/microwave/src/magnetron/waveform.rs
@@ -2,11 +2,12 @@ use std::collections::HashMap;
 
 use magnetron::{
     automation::{AutomatableParam, AutomationFactory},
-    envelope::EnvelopeSpec,
     stage::Stage,
 };
 use serde::{Deserialize, Serialize};
 
+use crate::magnetron::envelope::EnvelopeSpec;
+
 use super::{source::StorageAccess, StageType};
 
 #[derive(Clone, Debug, Deserialize, Serialize)]

diff --git a/microwave/src/profile.rs b/microwave/src/profile.rs
@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 use cpal::SampleRate;
 use flume::Sender;
-use magnetron::{automation::AutomationFactory, envelope::EnvelopeSpec, stage::Stage};
+use magnetron::{automation::AutomationFactory, stage::Stage};
 use serde::{Deserialize, Serialize};
 use std::{any::Any, collections::HashMap};
 use tune_cli::{shared::error::ResultExt, CliResult};
@@ -14,6 +14,7 @@ use crate::{
     control::LiveParameter,
     fluid::FluidSpec,
     magnetron::{
+        envelope::EnvelopeSpec,
         source::{LfSource, NoAccess},
         waveform::{NamedEnvelopeSpec, WaveformProperty},
         FragmentSpec, GeneratorSpec, MergeProcessorSpec, ProcessorSpec, StereoProcessorSpec,

diff --git a/microwave/src/synth.rs b/microwave/src/synth.rs
@@ -4,7 +4,6 @@ use cpal::SampleRate;
 use flume::{Receiver, Sender};
 use magnetron::{
     automation::AutomationFactory,
-    envelope::EnvelopeSpec,
     stage::{Stage, StageActivity},
     Magnetron,
 };
@@ -17,7 +16,10 @@ use tune::{
 use crate::{
     backend::{Backend, NoteInput},
     control::{LiveParameterStorage, ParameterValue},
-    magnetron::waveform::{WaveformProperties, WaveformSpec},
+    magnetron::{
+        envelope::EnvelopeSpec,
+        waveform::{WaveformProperties, WaveformSpec},
+    },
     profile::{MainAutomatableValue, MainPipeline, WaveformAutomatableValue, WaveformPipeline},
 };