diff --git a/crates/tek/src/cli/cli_arranger.rs b/crates/tek/src/cli/cli_arranger.rs index b7f3ceb9..796f3ad9 100644 --- a/crates/tek/src/cli/cli_arranger.rs +++ b/crates/tek/src/cli/cli_arranger.rs @@ -1,5 +1,5 @@ +#![allow(unused)] #![allow(clippy::unit_arg)] - include!("../lib.rs"); pub fn main () -> Usually<()> { diff --git a/crates/tek/src/cli/cli_groovebox.rs b/crates/tek/src/cli/cli_groovebox.rs index 77bac1bc..d3339871 100644 --- a/crates/tek/src/cli/cli_groovebox.rs +++ b/crates/tek/src/cli/cli_groovebox.rs @@ -1,3 +1,5 @@ +#![allow(unused)] +#![allow(clippy::unit_arg)] include!("../lib.rs"); pub fn main () -> Usually<()> { GrooveboxCli::parse().run() @@ -10,14 +12,14 @@ pub struct GrooveboxCli; impl GrooveboxCli { fn run (&self) -> Usually<()> { Tui::run(JackClient::new("tek_groovebox")?.activate_with(|jack|{ - let midi_in_1 = jack.read().unwrap().register_port("in1", MidiIn::default())?; + let app = GrooveboxTui::try_from(jack)?; let midi_out = jack.read().unwrap().register_port("out", MidiOut::default())?; + let midi_in_1 = jack.read().unwrap().register_port("in1", MidiIn::default())?; let midi_in_2 = jack.read().unwrap().register_port("in2", MidiIn::default())?; let audio_in_1 = jack.read().unwrap().register_port("inL", AudioIn::default())?; let audio_in_2 = jack.read().unwrap().register_port("inR", AudioIn::default())?; let audio_out_1 = jack.read().unwrap().register_port("out1", AudioOut::default())?; let audio_out_2 = jack.read().unwrap().register_port("out2", AudioOut::default())?; - let mut app = GrooveboxTui::try_from(jack)?; Ok(app) })?)?; Ok(()) diff --git a/crates/tek/src/cli/cli_sampler.rs b/crates/tek/src/cli/cli_sampler.rs index 4b882fb9..aeda9da0 100644 --- a/crates/tek/src/cli/cli_sampler.rs +++ b/crates/tek/src/cli/cli_sampler.rs @@ -1,5 +1,6 @@ +#![allow(unused)] +#![allow(clippy::unit_arg)] include!("../lib.rs"); - pub fn main () -> Usually<()> { SamplerCli::parse().run() } diff --git a/crates/tek/src/cli/cli_sequencer.rs b/crates/tek/src/cli/cli_sequencer.rs index c44cc30f..16b9cfde 100644 --- a/crates/tek/src/cli/cli_sequencer.rs +++ b/crates/tek/src/cli/cli_sequencer.rs @@ -1,7 +1,6 @@ +#![allow(unused)] #![allow(clippy::unit_arg)] - include!("../lib.rs"); - pub fn main () -> Usually<()> { SequencerCli::parse().run() } diff --git a/crates/tek/src/cli/cli_transport.rs b/crates/tek/src/cli/cli_transport.rs index 68f47c94..68fb9c7c 100644 --- a/crates/tek/src/cli/cli_transport.rs +++ b/crates/tek/src/cli/cli_transport.rs @@ -1,5 +1,6 @@ +#![allow(unused)] +#![allow(clippy::unit_arg)] include!("../lib.rs"); - /// Application entrypoint. pub fn main () -> Usually<()> { Tui::run(JackClient::new("tek_transport")?.activate_with(|jack|{ diff --git a/crates/tek/src/jack.rs b/crates/tek/src/jack.rs index 7dbd2c08..ee6f698e 100644 --- a/crates/tek/src/jack.rs +++ b/crates/tek/src/jack.rs @@ -1,5 +1,5 @@ pub use ::jack as libjack; -pub(crate) mod activate; pub(crate) use self::activate::*; +pub(crate) mod activate; #[allow(unused)] pub(crate) use self::activate::*; pub(crate) mod audio; pub(crate) use self::audio::*; pub(crate) mod client; pub(crate) use self::client::*; pub(crate) mod jack_event; pub(crate) use self::jack_event::*; diff --git a/crates/tek/src/lib.rs b/crates/tek/src/lib.rs index 5976df1c..0ab08cec 100644 --- a/crates/tek/src/lib.rs +++ b/crates/tek/src/lib.rs @@ -19,7 +19,8 @@ pub use ::atomic_float; pub(crate) use atomic_float::*; pub(crate) use std::sync::{Arc, Mutex, RwLock}; -pub(crate) use std::sync::atomic::{Ordering, AtomicBool, AtomicUsize}; +#[allow(unused)] pub(crate) use std::sync::atomic::Ordering; +pub(crate) use std::sync::atomic::{AtomicBool, AtomicUsize}; pub(crate) use std::collections::BTreeMap; pub(crate) use std::marker::PhantomData; pub(crate) use std::thread::{spawn, JoinHandle}; diff --git a/crates/tek/src/space/push_pull.rs b/crates/tek/src/space/push_pull.rs index 2b83bd0e..0cd5ef67 100644 --- a/crates/tek/src/space/push_pull.rs +++ b/crates/tek/src/space/push_pull.rs @@ -68,7 +68,6 @@ impl> Render for Push { Self::X(x, _) => [area.x() + x, area.y(), size.w(), size.h()], Self::Y(y, _) => [area.x(), area.y() + y, size.w(), size.h()], Self::XY(x, y, _) => [area.x() + x, area.y() + y, size.w(), size.h()], - _ => unreachable!(), }.into(), self.inner())).transpose()?.unwrap_or(())) } } diff --git a/crates/tek/src/space/shrink_grow.rs b/crates/tek/src/space/shrink_grow.rs index 9c725ef4..9d900843 100644 --- a/crates/tek/src/space/shrink_grow.rs +++ b/crates/tek/src/space/shrink_grow.rs @@ -49,7 +49,6 @@ impl> Shrink { Self::X(_, i) => i, Self::Y(_, i) => i, Self::XY(_, _, i) => i, - _ => unreachable!(), } } } diff --git a/crates/tek/src/tui.rs b/crates/tek/src/tui.rs index 31a0d242..1f855846 100644 --- a/crates/tek/src/tui.rs +++ b/crates/tek/src/tui.rs @@ -27,7 +27,7 @@ mod arranger_scene; pub(crate) use self::arranger_scene::*; mod arranger_select; pub(crate) use self::arranger_select::*; mod arranger_track; pub(crate) use self::arranger_track::*; mod arranger_mode; pub(crate) use self::arranger_mode::*; -mod arranger_v; pub(crate) use self::arranger_v::*; +mod arranger_v; #[allow(unused)] pub(crate) use self::arranger_v::*; mod arranger_h; //////////////////////////////////////////////////////// diff --git a/crates/tek/src/tui/arranger_v/v_clips.rs b/crates/tek/src/tui/arranger_v/v_clips.rs index 4aee54a9..ad8568e2 100644 --- a/crates/tek/src/tui/arranger_v/v_clips.rs +++ b/crates/tek/src/tui/arranger_v/v_clips.rs @@ -39,8 +39,8 @@ impl<'a> ArrangerVClips<'a> { scene: &'a ArrangerScene, index: usize, track: &'a ArrangerTrack, w: u16, h: u16 ) -> impl Render + use<'a> { Fixed::wh(w, h, Layers::new(move |add|{ - let mut bg = TuiTheme::border_bg(); if let Some(Some(phrase)) = scene.clips.get(index) { + let mut bg = TuiTheme::border_bg(); let name = &(phrase as &Arc>).read().unwrap().name; let name = format!("{}", name); let max_w = name.len().min((w as usize).saturating_sub(2)); @@ -55,7 +55,6 @@ impl<'a> ArrangerVClips<'a> { Tui::push_x(1, Fixed::w(w as u16, &name.as_str()[0..max_w]))) )?; } - //add(&Background(bg)) Ok(()) })) } diff --git a/crates/tek/src/tui/piano_h/piano_h_time.rs b/crates/tek/src/tui/piano_h/piano_h_time.rs index 6c2d4ec3..e90d9e7c 100644 --- a/crates/tek/src/tui/piano_h/piano_h_time.rs +++ b/crates/tek/src/tui/piano_h/piano_h_time.rs @@ -1,5 +1,4 @@ use crate::*; -use super::note_y_iter; pub struct PianoHorizontalTimeline<'a>(pub(crate) &'a PianoHorizontal); render!(|self: PianoHorizontalTimeline<'a>|render(|to|{