From e5752ea4b0089f0cef5a8e7044c468c580561fa5 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sat, 10 May 2025 21:44:36 +0300 Subject: [PATCH] fix warnings --- crates/device/src/clock/clock_model.rs | 2 +- crates/device/src/editor.rs | 4 +--- crates/device/src/editor/editor_api.rs | 2 +- crates/device/src/editor/editor_model.rs | 2 +- crates/device/src/editor/editor_view_h.rs | 2 +- crates/device/src/lib.rs | 3 +++ crates/device/src/lv2.rs | 8 ++++---- crates/device/src/lv2/lv2_model.rs | 1 - crates/device/src/sampler.rs | 2 -- crates/device/src/sampler/sampler_api.rs | 3 --- crates/device/src/sampler/sampler_view.rs | 2 +- crates/device/src/sequencer.rs | 4 ++-- crates/device/src/sequencer/seq_model.rs | 3 +-- 13 files changed, 16 insertions(+), 22 deletions(-) diff --git a/crates/device/src/clock/clock_model.rs b/crates/device/src/clock/clock_model.rs index f16e3558..e9016264 100644 --- a/crates/device/src/clock/clock_model.rs +++ b/crates/device/src/clock/clock_model.rs @@ -29,7 +29,7 @@ pub struct Clock { } impl std::fmt::Debug for Clock { - fn fmt (&self, f: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> { + fn fmt (&self, f: &mut Formatter<'_>) -> std::result::Result<(), std::fmt::Error> { f.debug_struct("Clock") .field("timebase", &self.timebase) .field("chunk", &self.chunk) diff --git a/crates/device/src/editor.rs b/crates/device/src/editor.rs index eb81e5b9..5ce20dd0 100644 --- a/crates/device/src/editor.rs +++ b/crates/device/src/editor.rs @@ -1,7 +1,5 @@ -use crate::*; - mod editor_api; pub use self::editor_api::*; mod editor_model; pub use self::editor_model::*; -mod editor_view; pub use self::editor_view::*; +mod editor_view; //pub use self::editor_view::*; mod editor_view_h; pub use self::editor_view_h::*; mod editor_view_v; pub use self::editor_view_v::*; diff --git a/crates/device/src/editor/editor_api.rs b/crates/device/src/editor/editor_api.rs index d2cee7db..a1c6a6e5 100644 --- a/crates/device/src/editor/editor_api.rs +++ b/crates/device/src/editor/editor_api.rs @@ -82,7 +82,7 @@ use crate::*; editor.put_note(false); Ok(None) } - fn note_del (editor: &mut MidiEditor) -> Perhaps { + fn note_del (_editor: &mut MidiEditor) -> Perhaps { todo!() } fn note_pos (editor: &mut MidiEditor, pos: usize) -> Perhaps { diff --git a/crates/device/src/editor/editor_model.rs b/crates/device/src/editor/editor_model.rs index 5c648b70..a92e96ba 100644 --- a/crates/device/src/editor/editor_model.rs +++ b/crates/device/src/editor/editor_model.rs @@ -9,7 +9,7 @@ pub struct MidiEditor { } impl std::fmt::Debug for MidiEditor { - fn fmt (&self, f: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> { + fn fmt (&self, f: &mut Formatter<'_>) -> std::result::Result<(), std::fmt::Error> { f.debug_struct("MidiEditor") .field("mode", &self.mode) .finish() diff --git a/crates/device/src/editor/editor_view_h.rs b/crates/device/src/editor/editor_view_h.rs index 72365a09..b9bf650b 100644 --- a/crates/device/src/editor/editor_view_h.rs +++ b/crates/device/src/editor/editor_view_h.rs @@ -286,7 +286,7 @@ impl MidiViewer for PianoHorizontal { } impl std::fmt::Debug for PianoHorizontal { - fn fmt (&self, f: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> { + fn fmt (&self, f: &mut Formatter<'_>) -> std::result::Result<(), std::fmt::Error> { let buffer = self.buffer.read().unwrap(); f.debug_struct("PianoHorizontal") .field("time_zoom", &self.range.time_zoom) diff --git a/crates/device/src/lib.rs b/crates/device/src/lib.rs index 88c4cd6f..f15f3a7a 100644 --- a/crates/device/src/lib.rs +++ b/crates/device/src/lib.rs @@ -32,6 +32,9 @@ pub use self::device::*; #[cfg(feature = "sampler")] mod sampler; #[cfg(feature = "sampler")] pub use self::sampler::*; +#[cfg(feature = "meter")] mod meter; +#[cfg(feature = "meter")] pub use self::meter::*; + #[cfg(feature = "lv2")] mod lv2; #[cfg(feature = "lv2")] pub use self::lv2::*; diff --git a/crates/device/src/lv2.rs b/crates/device/src/lv2.rs index b1f0b505..4610b30b 100644 --- a/crates/device/src/lv2.rs +++ b/crates/device/src/lv2.rs @@ -1,5 +1,5 @@ mod lv2_model; pub use self::lv2_model::*; -mod lv2_audio; pub use self::lv2_audio::*; -mod lv2_gui; pub use self::lv2_gui::*; -mod lv2_tui; pub use self::lv2_tui::*; -pub(self) use std::thread::JoinHandle; +mod lv2_audio; //pub use self::lv2_audio::*; +mod lv2_gui; pub use self::lv2_gui::*; +mod lv2_tui; //pub use self::lv2_tui::*; +//pub(self) use std::thread::JoinHandle; diff --git a/crates/device/src/lv2/lv2_model.rs b/crates/device/src/lv2/lv2_model.rs index 875a31bb..64679f75 100644 --- a/crates/device/src/lv2/lv2_model.rs +++ b/crates/device/src/lv2/lv2_model.rs @@ -1,5 +1,4 @@ use crate::*; -use super::*; /// A LV2 plugin. #[derive(Debug)] diff --git a/crates/device/src/sampler.rs b/crates/device/src/sampler.rs index 6423684b..b201fb54 100644 --- a/crates/device/src/sampler.rs +++ b/crates/device/src/sampler.rs @@ -1,5 +1,3 @@ -use crate::*; - pub(crate) use symphonia::{ core::{ formats::Packet, diff --git a/crates/device/src/sampler/sampler_api.rs b/crates/device/src/sampler/sampler_api.rs index 5d1279da..e374f88e 100644 --- a/crates/device/src/sampler/sampler_api.rs +++ b/crates/device/src/sampler/sampler_api.rs @@ -1,8 +1,5 @@ use crate::*; -macro_rules! cmd { ($cmd:expr) => {{ $cmd; None }}; } -macro_rules! cmd_todo { ($msg:literal) => {{ println!($msg); None }}; } - #[tengri_proc::expose] impl Sampler { //fn file_browser_filter (&self) -> Arc { diff --git a/crates/device/src/sampler/sampler_view.rs b/crates/device/src/sampler/sampler_view.rs index 2b5c3fad..d984b3a4 100644 --- a/crates/device/src/sampler/sampler_view.rs +++ b/crates/device/src/sampler/sampler_view.rs @@ -62,7 +62,7 @@ impl Sampler { Fixed::x(12, Map::south( 1, move||(note_lo..=note_hi).rev(), - move|note, i| { + move|note, _index| { //let offset = |a|Push::y(i as u16, Align::n(Fixed::y(1, Fill::x(a)))); let mut bg = if note == note_pt { Tui::g(64) } else { Color::Reset }; let mut fg = Tui::g(160); diff --git a/crates/device/src/sequencer.rs b/crates/device/src/sequencer.rs index 6f8ca260..df991b7f 100644 --- a/crates/device/src/sequencer.rs +++ b/crates/device/src/sequencer.rs @@ -1,11 +1,10 @@ -use crate::*; - mod seq_clip; pub use self::seq_clip::*; mod seq_launch; pub use self::seq_launch::*; mod seq_model; pub use self::seq_model::*; mod seq_view; pub use self::seq_view::*; #[cfg(test)] #[test] pub fn test_midi_clip () { + use crate::*; let clip = MidiClip::stop_all(); println!("{clip:?}"); @@ -22,6 +21,7 @@ mod seq_view; pub use self::seq_view::*; } #[cfg(test)] #[test] fn test_midi_play () { + use crate::*; let sequencer = Sequencer::default(); println!("{sequencer:?}"); } diff --git a/crates/device/src/sequencer/seq_model.rs b/crates/device/src/sequencer/seq_model.rs index db65cd55..c55a839a 100644 --- a/crates/device/src/sequencer/seq_model.rs +++ b/crates/device/src/sequencer/seq_model.rs @@ -1,6 +1,5 @@ //! MIDI sequencer use crate::*; -use tek_engine::jack::*; pub trait HasSequencer { fn sequencer (&self) -> &impl MidiPlayerApi; @@ -98,7 +97,7 @@ impl Sequencer { } impl std::fmt::Debug for Sequencer { - fn fmt (&self, f: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> { + fn fmt (&self, f: &mut Formatter<'_>) -> std::result::Result<(), std::fmt::Error> { f.debug_struct("Sequencer") .field("clock", &self.clock) .field("play_clip", &self.play_clip)