diff --git a/Cargo.toml b/Cargo.toml index d6a1162..6a520e8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,23 @@ -[package] -name = "fader_master" +# cargo-features = ["codegen-backend"] + +[workspace] +members = [ "tui", "sound" , "fader_master", "midi"] +resolver = "3" + +[workspace.package] version = "0.1.0" edition = "2024" -[dependencies] +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[profile.dev] +debug = true +strip = false +# codegen-backend = "cranelift" +split-debuginfo = "off" + +[profile.release] +lto = true +codegen-units = 1 +panic = "abort" +strip = "none" diff --git a/README.md b/README.md index fe37bb3..2cc9a7c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ # fader_master -Fast test implementation of a midi-fader based software \ No newline at end of file +Rushed test implementation of a midi-fader based software + +# References + +* [pwvucontrol](https://github.com/saivert/pwvucontrol/blob/main/src/backend/pwnodeobject/mixerapi.rs) +* [ratatui](https://ratatui.rs/) +* [midir](https://github.com/Boddlnagg/midir) diff --git a/fader_master/Cargo.toml b/fader_master/Cargo.toml new file mode 100644 index 0000000..ce6d5ab --- /dev/null +++ b/fader_master/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "fader_master" +version.workspace = true +edition.workspace = true + +[dependencies] diff --git a/src/main.rs b/fader_master/src/main.rs similarity index 100% rename from src/main.rs rename to fader_master/src/main.rs diff --git a/midi/Cargo.toml b/midi/Cargo.toml new file mode 100644 index 0000000..def58a0 --- /dev/null +++ b/midi/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "midi" +version.workspace = true +edition.workspace = true + +[dependencies] diff --git a/midi/src/lib.rs b/midi/src/lib.rs new file mode 100644 index 0000000..b93cf3f --- /dev/null +++ b/midi/src/lib.rs @@ -0,0 +1,14 @@ +pub fn add(left: u64, right: u64) -> u64 { + left + right +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn it_works() { + let result = add(2, 2); + assert_eq!(result, 4); + } +} diff --git a/sound/Cargo.toml b/sound/Cargo.toml new file mode 100644 index 0000000..921a911 --- /dev/null +++ b/sound/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "volume_lib" +version = "0.1.0" +edition = "2024" + +[dependencies] diff --git a/sound/src/lib.rs b/sound/src/lib.rs new file mode 100644 index 0000000..b93cf3f --- /dev/null +++ b/sound/src/lib.rs @@ -0,0 +1,14 @@ +pub fn add(left: u64, right: u64) -> u64 { + left + right +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn it_works() { + let result = add(2, 2); + assert_eq!(result, 4); + } +} diff --git a/tui/Cargo.toml b/tui/Cargo.toml new file mode 100644 index 0000000..4ea315d --- /dev/null +++ b/tui/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "tui" +version = "0.1.0" +edition = "2024" + +[dependencies] +ratatui = { version = "0.29.0", features = ["all-widgets", "serde"] } diff --git a/tui/examples/tui_test.rs b/tui/examples/tui_test.rs new file mode 100644 index 0000000..49f3aa5 --- /dev/null +++ b/tui/examples/tui_test.rs @@ -0,0 +1,9 @@ +use std::io; +use tui::Tui; + +fn main() -> io::Result<()> { + let mut terminal = ratatui::init(); + let app_result = Tui::default().run(&mut terminal); + ratatui::restore(); + app_result +} diff --git a/tui/src/lib.rs b/tui/src/lib.rs new file mode 100644 index 0000000..0726b13 --- /dev/null +++ b/tui/src/lib.rs @@ -0,0 +1,113 @@ +//! Simple lib to handle creation of a simple TUI to visualisize faders +//! +//! Kinda specless for now, there are faders, volume, menu nav, fader creation, destruction and outputs +//! +//! +use std::io; + +use crossterm::event::{self, Event, KeyCode, KeyEvent, KeyEventKind}; +use ratatui::{ + DefaultTerminal, Frame, + buffer::Buffer, + crossterm, + layout::Rect, + style::Stylize, + symbols::border, + text::{Line, Text}, + widgets::{Block, Paragraph, Widget}, +}; + +/// Experimental global runner +#[allow(dead_code)] +#[derive(Debug, Default)] +pub struct Tui { + volume: u8, + exit: bool, +} + +impl Tui { + /// Runs the application's main loop until the user quits + pub fn run(&mut self, terminal: &mut DefaultTerminal) -> io::Result<()> { + while !self.exit { + terminal.draw(|frame| self.draw(frame))?; + self.handle_events()?; + } + Ok(()) + } + + /// Draw a frame + fn draw(&self, frame: &mut Frame) { + frame.render_widget(self, frame.area()); + } + + /// Process all the event handling + fn handle_events(&mut self) -> io::Result<()> { + match event::read()? { + // it's important to check that the event is a key press event as + // crossterm also emits key release and repeat events on Windows. + Event::Key(key_event) if key_event.kind == KeyEventKind::Press => { + self.handle_key_event(key_event) + } + _ => {} + }; + Ok(()) + } + + fn handle_key_event(&mut self, key_event: KeyEvent) { + match key_event.code { + KeyCode::Char('q') => self.exit(), + // KeyCode::Left => self.decrement_counter(), + // KeyCode::Right => self.increment_counter(), + _ => {} + } + } + + fn exit(&mut self) { + self.exit = true; + } +} + +/// Makes the Tui into a Widget to use it as +impl Widget for &Tui { + fn render(self, area: Rect, buf: &mut Buffer) { + let title = Line::from("TUI Title".bold()); + let instructions = Line::from(vec![ + " Decrement ".into(), + "".blue().bold(), + " Increment ".into(), + "".blue().bold(), + " Quit ".into(), + " ".blue().bold(), + ]); + let block = Block::bordered() + .title(title.centered()) + .title_bottom(instructions.centered()) + .border_set(border::THICK); + + let counter_text = Text::from(vec![Line::from(vec![ + "Volume: ".into(), + self.volume.to_string().yellow(), + ])]); + + Paragraph::new(counter_text) + .centered() + .block(block) + .render(area, buf); + } +} + +#[allow(dead_code)] +/// An individual volume widget +pub struct SingleFader { + /// The individual volume of the fader + volume: usize, + // application: String, + midi_note: Vec, +} + +#[cfg(test)] +mod tests { + + #[test] + fn it_works() {} +}