diff --git a/Cargo.lock b/Cargo.lock index a4201e2..3b82aa6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,7 +35,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -62,12 +62,37 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "colored" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" +dependencies = [ + "lazy_static", + "windows-sys 0.59.0", +] + +[[package]] +name = "deranged" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" +dependencies = [ + "powerfmt", +] + [[package]] name = "gimli" version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + [[package]] name = "jack" version = "0.13.3" @@ -138,6 +163,8 @@ name = "looper" version = "0.1.0" dependencies = [ "jack", + "log", + "simple_logger", "thiserror", "tokio", ] @@ -168,6 +195,21 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + [[package]] name = "object" version = "0.36.7" @@ -197,7 +239,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -212,6 +254,12 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "proc-macro2" version = "1.0.95" @@ -251,6 +299,26 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "signal-hook-registry" version = "1.4.5" @@ -260,6 +328,18 @@ dependencies = [ "libc", ] +[[package]] +name = "simple_logger" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c5dfa5e08767553704aa0ffd9d9794d527103c736aba9854773851fd7497eb" +dependencies = [ + "colored", + "log", + "time", + "windows-sys 0.48.0", +] + [[package]] name = "smallvec" version = "1.15.0" @@ -307,6 +387,39 @@ dependencies = [ "syn", ] +[[package]] +name = "time" +version = "0.3.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" + +[[package]] +name = "time-macros" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +dependencies = [ + "num-conv", + "time-core", +] + [[package]] name = "tokio" version = "1.45.1" @@ -370,13 +483,22 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows-sys" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -385,7 +507,22 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -394,28 +531,46 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -428,24 +583,48 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" diff --git a/Cargo.toml b/Cargo.toml index dbe4c73..19c7003 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,4 +6,6 @@ edition = "2021" [dependencies] thiserror = "1.0" jack = "0.13" -tokio = { version = "1.0", features = ["full"] } \ No newline at end of file +tokio = { version = "1.0", features = ["full"] } +log = "0.4.27" +simple_logger = "5.0.0" diff --git a/src/main.rs b/src/main.rs index 7220e29..8d3067d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,6 +2,7 @@ mod allocator; mod audio_chunk; mod chunk_factory; mod looper_error; +mod notification_handler; mod process_handler; mod track; @@ -12,38 +13,61 @@ use audio_chunk::AudioChunk; use chunk_factory::ChunkFactory; use looper_error::LooperError; use looper_error::Result; +use notification_handler::JackNotification; +use notification_handler::NotificationHandler; use process_handler::ProcessHandler; use track::Track; #[tokio::main] async fn main() { - let (allocator, factory_handle) = Allocator::spawn(5000, 100); + simple_logger::SimpleLogger::new().init().expect("Could not initialize logger"); + let (jack_client, audio_in, audio_out) = setup_jack(); + + let (allocator, factory_handle) = Allocator::spawn(jack_client.buffer_size() as usize * 10, 100); + + let process_handler = ProcessHandler::new(audio_in, audio_out, allocator) + .expect("Could not create process handler"); + + let notification_handler = NotificationHandler::new(); + let mut notification_channel = notification_handler.subscribe(); + + let _async_client = jack_client + .activate_async(notification_handler, process_handler) + .expect("Could not activate Jack"); + + tokio::select! { + notification = notification_channel.recv() => { + match notification { + Ok(JackNotification::Shutdown {reason, status}) => { + log::error!("Jack shutdown: {reason} {status:?}"); + } + Err(e) => { + log::error!("NotificationHandler stopped: {e}"); + } + } + } + _ = factory_handle => { + log::error!("Allocator was dropped"); + } + _ = tokio::signal::ctrl_c() => { + log::info!("Stopping"); + } + } +} + +fn setup_jack() -> (jack::Client, jack::Port, jack::Port) { let (jack_client, jack_status) = jack::Client::new("looper", jack::ClientOptions::NO_START_SERVER) .expect("Could not create Jack client"); if !jack_status.is_empty() { - println!("Could not start jack client: {jack_status:?}"); - return; + panic!("Could not start jack client: {jack_status:?}"); } - let audio_in = jack_client .register_port("audio_in", jack::AudioIn::default()) .expect("Could not create audio_in port"); let audio_out = jack_client .register_port("audio_out", jack::AudioOut::default()) .expect("Could not create audio_out port"); - - let process_handler = ProcessHandler::new(audio_in, audio_out, allocator) - .expect("Could not create process handler"); - - let async_client = jack_client - .activate_async((), process_handler) - .expect("Could not activate Jack"); - - factory_handle.await.unwrap(); - - async_client - .deactivate() - .expect("Could not deactivate Jack"); -} + (jack_client, audio_in, audio_out) +} \ No newline at end of file diff --git a/src/notification_handler.rs b/src/notification_handler.rs new file mode 100644 index 0000000..b1c4058 --- /dev/null +++ b/src/notification_handler.rs @@ -0,0 +1,31 @@ +pub struct NotificationHandler { + channel: tokio::sync::broadcast::Sender, +} + +#[derive(Clone, Debug)] +pub enum JackNotification { + Shutdown{ + status: jack::ClientStatus, + reason: String + }, +} + +impl NotificationHandler { + pub fn new() -> Self { + let (channel, _) = tokio::sync::broadcast::channel(1); + Self { + channel, + } + } + + pub fn subscribe(&self) -> tokio::sync::broadcast::Receiver { + self.channel.subscribe() + } +} + +impl jack::NotificationHandler for NotificationHandler { + unsafe fn shutdown(&mut self, status: jack::ClientStatus, reason: &str) { + let reason = reason.to_string(); + self.channel.send(JackNotification::Shutdown { status, reason }).expect("Could not send shutdown notification"); + } +} \ No newline at end of file diff --git a/src/process_handler.rs b/src/process_handler.rs index abda7c0..92c1a3e 100644 --- a/src/process_handler.rs +++ b/src/process_handler.rs @@ -41,11 +41,11 @@ impl jack::ProcessHandler for ProcessHandler { let sample_count_to_append = sample_count_to_append.min(recording_samples - self.track.len()); let samples_to_append = &input_buffer[index..index + sample_count_to_append]; - if self + if let Err(e) = self .track .append_samples(samples_to_append, &mut self.chunk_factory) - .is_err() { + log::error!("Could not append samples: {e}"); return jack::Control::Quit; }; output_buffer[index..(index + sample_count_to_append)].fill(0.0); @@ -55,21 +55,22 @@ impl jack::ProcessHandler for ProcessHandler { let sample_count_to_play = jack_buffer_size - index; let sample_count_to_play = sample_count_to_play.min(self.track.len() - self.playback_position); - if self + if let Err(e) = self .track .copy_samples( &mut output_buffer[index..(index + sample_count_to_play)], self.playback_position, ) - .is_err() { + log::error!("Could not copy samples: {e}"); return jack::Control::Quit; } index += sample_count_to_play; self.playback_position += sample_count_to_play; if self.playback_position >= self.track.len() { self.playback_position = 0; - if self.track.clear(&mut self.chunk_factory).is_err() { + if let Err(e) = self.track.clear(&mut self.chunk_factory) { + log::error!("Could not clear track: {e}"); return jack::Control::Quit; } }