diff --git a/crates/device/Cargo.toml b/crates/device/Cargo.toml index 669f1efc..ef59f3ba 100644 --- a/crates/device/Cargo.toml +++ b/crates/device/Cargo.toml @@ -13,7 +13,12 @@ wavers = { workspace = true, optional = true } [features] default = [ "clock", "sequencer", "sampler" ] -lv2 = [ "livi" ] +clock = [] sampler = [ "symphonia", "wavers" ] sequencer = [ "clock", "uuid" ] -clock = [] +plugin = [] # temporary +lv2 = [ "livi" ] +vst2 = [] +vst3 = [] +clap = [] +sf2 = [] diff --git a/crates/device/src/lib.rs b/crates/device/src/lib.rs index 2531f35a..6c786213 100644 --- a/crates/device/src/lib.rs +++ b/crates/device/src/lib.rs @@ -29,10 +29,12 @@ pub(crate) use ratatui::{prelude::Rect, widgets::{Widget, canvas::{Canvas, Line} #[derive(Debug)] pub enum Device { - #[cfg(feature = "sequencer")] - Sequencer(MidiPlayer), - #[cfg(feature = "sampler")] - Sampler(Sampler), - #[cfg(feature = "plugin")] - Plugin(Plugin), + #[cfg(feature = "sequencer")] Sequencer(MidiPlayer), + #[cfg(feature = "sampler")] Sampler(Sampler), + #[cfg(feature = "plugin")] Plugin(Plugin), + #[cfg(feature = "lv2")] Lv2, // TODO + #[cfg(feature = "vst2")] Vst2, // TODO + #[cfg(feature = "vst3")] Vst3, // TODO + #[cfg(feature = "clap")] Clap, // TODO + #[cfg(feature = "sf2")] Sf2, // TODO } diff --git a/crates/engine/src/jack.rs b/crates/engine/src/jack.rs index bcc64a04..b13d667e 100644 --- a/crates/engine/src/jack.rs +++ b/crates/engine/src/jack.rs @@ -15,4 +15,3 @@ pub(crate) use std::sync::{Arc, RwLock}; mod jack_client; pub use self::jack_client::*; mod jack_event; pub use self::jack_event::*; mod jack_port; pub use self::jack_port::*; - diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs index da26acb2..b4840a09 100644 --- a/crates/engine/src/lib.rs +++ b/crates/engine/src/lib.rs @@ -1,7 +1,7 @@ #![feature(type_alias_impl_trait)] -mod time; pub use self::time::*; -mod note; pub use self::note::*; +mod time; pub use self::time::*; +mod note; pub use self::note::*; pub mod jack; pub use self::jack::*; pub mod midi; pub use self::midi::*; @@ -10,11 +10,7 @@ pub(crate) use std::path::PathBuf; pub(crate) use std::fmt::Debug; pub(crate) use std::ops::{Add, Sub, Mul, Div, Rem}; -pub(crate) use ::tengri::input::*; -pub(crate) use ::tengri::output::*; -pub(crate) use ::tengri::dsl::*; pub(crate) use ::tengri::tui::*; -pub(crate) use ::tengri::tui::ratatui::style::{Style, Stylize, Color}; pub use ::atomic_float; pub(crate) use atomic_float::*;