Various viz improvements

Author: gridbugs

live/Cargo.toml

@@ -12,4 +12,5 @@ documentation = "https://docs.rs/caw_live"
 [dependencies]
 caw_core = { version = "0.5", path = "../core" }
 caw_player = { version = "0.8", path = "../player" }
+caw_viz_udp_app_lib = { version = "0.1", path = "../viz-udp-app-lib" }
 lazy_static = "1.5"

live/src/lib.rs

@@ -2,8 +2,9 @@ use caw_core::{Sig, SigBoxedVar, Stereo, StereoPair, svf32};
 use caw_player::{
     PlayerConfig, PlayerVisualizationData, VisualizationDataPolicy, play_stereo,
 };
+use caw_viz_udp_app_lib::{VizAppConfig, VizUdpServer};
 use lazy_static::lazy_static;
-use std::sync::Mutex;
+use std::{sync::Mutex, thread, time::Duration};
 
 lazy_static! {
     static ref OUT: StereoPair<Sig<SigBoxedVar<f32>>> =
@@ -13,9 +14,11 @@ lazy_static! {
     static ref INITIALIZED: Mutex<bool> = Mutex::new(false);
 }
 
-pub fn live_stereo_visualized(
+pub type LiveStereoOut = StereoPair<Sig<SigBoxedVar<f32>>>;
+
+pub fn live_stereo_viz(
     visualization_data_policy: VisualizationDataPolicy,
-) -> (StereoPair<Sig<SigBoxedVar<f32>>>, PlayerVisualizationData) {
+) -> (LiveStereoOut, PlayerVisualizationData) {
     let mut initialized = INITIALIZED.lock().unwrap();
     if *initialized {
         return (OUT.clone(), VISUALIZATION_DATA.lock().unwrap().clone());
@@ -35,7 +38,20 @@ pub fn live_stereo_visualized(
     (OUT.clone(), visualization_data_ref.clone())
 }
 
-pub fn live_stereo() -> StereoPair<Sig<SigBoxedVar<f32>>> {
+pub fn live_stereo_viz_udp(config: VizAppConfig) -> LiveStereoOut {
+    let (out, viz_data) = live_stereo_viz(VisualizationDataPolicy::All);
+    let mut viz = VizUdpServer::new(config).unwrap();
+    thread::spawn(move || {
+        loop {
+            // TODO: Is it ok to ignore errors here?
+            let _ = viz_data.with_and_clear(|buf| viz.send_samples(buf));
+            thread::sleep(Duration::from_millis(16));
+        }
+    });
+    out
+}
+
+pub fn live_stereo() -> LiveStereoOut {
     let mut initialized = INITIALIZED.lock().unwrap();
     if *initialized {
         return OUT.clone();

viz-udp-app-lib/src/lib.rs

@@ -31,7 +31,7 @@ impl Default for VizAppConfig {
             program_name: PROGRAM_NAME.to_string(),
             width: 640,
             height: 480,
-            scale: 100.0,
+            scale: 1000.0,
             max_num_samples: 5000,
             line_width: 1,
             alpha_scale: 255,

viz-udp-app/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "caw_viz_udp_app"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2024"
 description = "App for visualizing audio data from the caw synthesizer framework"
 authors = ["Stephen Sherratt <[email protected]>"]

viz-udp-app/src/main.rs

@@ -13,7 +13,7 @@ struct Args {
     width: u32,
     #[arg(long, default_value_t = 480)]
     height: u32,
-    #[arg(long, default_value_t = 100.0)]
+    #[arg(long, default_value_t = 1000.0)]
     scale: f32,
     #[arg(long, default_value_t = 5000)]
     max_num_samples: usize,
@@ -35,7 +35,7 @@ struct ScopeState {
 }
 
 fn main() -> anyhow::Result<()> {
-    let args = Args::parse();
+    let mut args = Args::parse();
     let sdl_context = sdl2::init().map_err(|e| anyhow!(e))?;
     let video_subsystem = sdl_context.video().map_err(|e| anyhow!(e))?;
     let window = video_subsystem
@@ -53,8 +53,31 @@ fn main() -> anyhow::Result<()> {
     let mut scope_state = ScopeState::default();
     loop {
         for event in event_pump.poll_iter() {
-            if let Event::Quit { .. } = event {
-                std::process::exit(0);
+            match event {
+                Event::Quit { .. } => std::process::exit(0),
+                Event::MouseWheel { y, .. } => {
+                    let ratio = 1.1;
+                    if y > 0 {
+                        args.scale *= ratio;
+                    } else {
+                        args.scale /= ratio;
+                    }
+                }
+                Event::MouseMotion {
+                    mousestate, xrel, ..
+                } => {
+                    if mousestate.left() {
+                        args.line_width = ((args.line_width as i32) + xrel)
+                            .clamp(1, 20)
+                            as u32;
+                    }
+                    if mousestate.right() {
+                        args.alpha_scale = (args.alpha_scale as i32 + xrel)
+                            .clamp(1, 255)
+                            as u8;
+                    }
+                }
+                _ => (),
             }
         }
         while let Ok(true) = viz_udp_client.recv_sample() {