tests pass

sowbug · Sep 24, 2023 · 6a98e51 · 6a98e51
1 parent 6c5d940
commit 6a98e51
Show file tree

Hide file tree

Showing 90 changed files with 246 additions and 14,755 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,6 +25,8 @@ eframe = { version = "0.22" }
 egui-toast = { version = "0.8" }
 egui_extras = { version = "0.22" }
 ensnare = { path = "../ensnare" }
+ensnare-core = { path = "../ensnare/core" }
+ensnare-not-core = { path = "../ensnare/not-core" }
 ensnare-midi-interface = { path = "../ensnare/midi-interface" }
 ensnare-proc-macros = { path = "../ensnare/proc-macros" }
 enum-primitive-derive = "0.2"

diff --git a/audio/src/lib.rs b/audio/src/lib.rs
@@ -9,7 +9,7 @@ use cpal::{
 };
 use crossbeam::queue::ArrayQueue;
 use crossbeam_channel::{unbounded, Receiver, Sender};
-use ensnare::prelude::*;
+use ensnare::{prelude::*, AudioQueue};
 use std::{fmt::Debug, result::Result::Ok, sync::Arc, thread::JoinHandle, time::Instant};
 
 pub enum AudioInterfaceInput {
@@ -35,11 +35,6 @@ pub enum AudioInterfaceEvent {
     Quit,
 }
 
-/// The producer-consumer queue of stereo samples that the audio stream consumes.
-//
-// TODO: why isn't this a ring buffer?
-pub type AudioQueue = Arc<ArrayQueue<StereoSample>>;
-
 #[derive(Debug)]
 pub struct AudioStreamService {
     input_sender: Sender<AudioInterfaceInput>,

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -11,7 +11,7 @@ anyhow = "1.0"
 bit-vec = "0.6"
 derive_more = "0.99"
 eframe = { version = "0.22" }
-ensnare = { path = "../../ensnare" }
+ensnare-core = { path = "../../ensnare/core" }
 enum-primitive-derive = "0.2"
 float-cmp = "0.9"
 ensnare-proc-macros = { path = "../../ensnare/proc-macros" }

diff --git a/core/src/control.rs b/core/src/control.rs
@@ -1,8 +1,6 @@
 // Copyright (c) 2023 Mike Tsao. All rights reserved.
 
-use crate::{BipolarNormal, Normal};
-use ensnare::prelude::*;
-
+use ensnare_core::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize)]