Merge pull request #38 from GoXLR-on-Linux/dev-0.7.0

Dev 0.7.0

Author: FrostyCoolSlug

Cargo.lock

@@ -9,4 +9,5 @@ members = [
     "types",
     "profile",
     "initialiser",
+    "scribbles",
 ]

Cargo.toml

@@ -1,5 +1,5 @@
 # Roadmap
-*Last Updated for 0.6.0 Release*
+*Last Updated for 0.7.0 Release*
 
 ## Completed Features
 * Initialisation of Devices under Linux<sup>1</sup>
@@ -16,13 +16,12 @@
 * The Voice Effects Panel
 * Full Lighting Configuration
 * Sampler Support<sup>4</sup>
+* Scribbles<sup>4</sup>
 
 <sup>1</sup> Depending on how your GoXLR works, this may require a reboot.  
 <sup>2</sup> Profiles are 'cross platform', so Windows profiles should work with the util, and vice versa  
-<sup>3</sup> Currently only configurable via the `goxlr-client`
-<sup>4</sup> UI is not complete (and is messy), but all functionality is present
+<sup>3</sup> Currently only configurable via the `goxlr-client`  
+<sup>4</sup> UI is not complete (and is messy), but all functionality is present  
 
 ## Not Completed
-* Scribbles
-  * Generally just a low priority, not overly complicated to achieve, but also not really that important, 
-    will arrive soon!
+* Lighting Animations

ROADMAP.md

@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-audio"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

audio/Cargo.toml

@@ -1,5 +1,8 @@
 use crate::audio::get_input;
 use anyhow::Result;
+use ebur128::{EbuR128, Mode};
+use log::info;
+use std::fs;
 use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
@@ -32,9 +35,14 @@ impl Recorder {
         // Grab the Audio Reader..
         let mut input = get_input(self.device.clone())?;
 
+        // We're going to use the normaliser to ensure that something loud was recorded.
+        let mut ebu_r128 = EbuR128::new(2, 48000, Mode::I)?;
+
         // Being the Read Loop..
         while !self.stop.load(Ordering::Relaxed) {
             if let Ok(samples) = input.read() {
+                ebu_r128.add_frames_f32(samples.as_slice())?;
+
                 for sample in samples {
                     writer.write_sample(sample)?;
                 }
@@ -45,6 +53,14 @@ impl Recorder {
         writer.flush()?;
         writer.finalize()?;
 
+        // Before we do anything else, was any noise recorded?
+        if let Ok(loudness) = ebu_r128.loudness_global() {
+            if loudness == f64::NEG_INFINITY {
+                // No noise received..
+                info!("No Noise Received in recording, Cancelling.");
+                fs::remove_file(&self.file)?;
+            }
+        }
         Ok(())
     }
 

audio/src/recorder.rs

@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-client"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2021"
 build = "build.rs"
 authors = ["Nathan Adams <[email protected]>", "Craig McLure <[email protected]>", "Lars Mühlbauer <[email protected]>"]
@@ -21,7 +21,7 @@ clap = { version = "3.0.0", features = ["derive"] }
 strum = { version = "0.23"}
 serde_json = { version = "1.0" }
 tokio-serde = { version = "0.8.0", features=["json"]}
-
+interprocess = { version = "1.2.0", features=["tokio_support"] }
 [build-dependencies]
 clap = { version = "3.0.0", features = ["derive"] }
 clap_complete = "3.0.0"

client/Cargo.toml

@@ -5,7 +5,7 @@ use goxlr_types::{
     EncoderColourTargets, EqFrequencies, FaderDisplayStyle, FaderName, GateTimes, GenderStyle,
     HardTuneSource, HardTuneStyle, InputDevice, MegaphoneStyle, MiniEqFrequencies, MuteFunction,
     OutputDevice, PitchStyle, ReverbStyle, RobotRange, RobotStyle, SampleBank, SampleButtons,
-    SimpleColourTargets,
+    SamplePlayOrder, SamplePlaybackMode, SimpleColourTargets,
 };
 use std::str::FromStr;
 
@@ -143,6 +143,20 @@ fn percent_value(s: &str) -> Result<u8, String> {
     Ok(value)
 }
 
+fn percent_value_float(s: &str) -> Result<f32, String> {
+    let value = f32::from_str(s);
+    if value.is_err() {
+        return Err(String::from("Value must be between 0 and 100"));
+    }
+
+    let value = value.unwrap();
+    if !(0.0..=100.0).contains(&value) {
+        return Err(String::from("Value must be between 0 and 100"));
+    }
+
+    Ok(value)
+}
+
 #[derive(Subcommand, Debug)]
 #[clap(setting = AppSettings::DeriveDisplayOrder)]
 #[clap(setting = AppSettings::ArgRequiredElseHelp)]
@@ -466,6 +480,37 @@ pub enum FaderCommands {
         #[clap(arg_enum)]
         mute_behaviour: MuteFunction,
     },
+
+    Scribbles {
+        #[clap(subcommand)]
+        command: Scribbles,
+    },
+}
+#[derive(Subcommand, Debug)]
+pub enum Scribbles {
+    Icon {
+        #[clap(arg_enum)]
+        fader: FaderName,
+        name: String,
+    },
+
+    Text {
+        #[clap(arg_enum)]
+        fader: FaderName,
+        text: String,
+    },
+
+    Number {
+        #[clap(arg_enum)]
+        fader: FaderName,
+        text: String,
+    },
+
+    Invert {
+        #[clap(arg_enum)]
+        fader: FaderName,
+        inverted: bool,
+    },
 }
 
 #[derive(Subcommand, Debug)]
@@ -913,6 +958,15 @@ pub enum HardTune {
 #[derive(Subcommand, Debug)]
 #[clap(setting = AppSettings::DeriveDisplayOrder)]
 #[clap(setting = AppSettings::ArgRequiredElseHelp)]
+
+/**
+Reference Commands:
+
+RemoveSampleByIndex(SampleBank, SampleButtons, usize),
+PlaySampleByIndex(SampleBank, SampleButtons, usize),
+StopSamplePlayback(SampleBank, SampleButtons),
+*/
+
 pub enum SamplerCommands {
     Add {
         #[clap(arg_enum)]
@@ -923,4 +977,80 @@ pub enum SamplerCommands {
 
         file: String,
     },
+
+    RemoveByIndex {
+        #[clap(arg_enum)]
+        bank: SampleBank,
+
+        #[clap(arg_enum)]
+        button: SampleButtons,
+
+        index: usize,
+    },
+
+    PlayByIndex {
+        #[clap(arg_enum)]
+        bank: SampleBank,
+
+        #[clap(arg_enum)]
+        button: SampleButtons,
+
+        index: usize,
+    },
+
+    StopPlayback {
+        #[clap(arg_enum)]
+        bank: SampleBank,
+
+        #[clap(arg_enum)]
+        button: SampleButtons,
+    },
+
+    PlaybackMode {
+        #[clap(arg_enum)]
+        bank: SampleBank,
+
+        #[clap(arg_enum)]
+        button: SampleButtons,
+
+        #[clap(arg_enum)]
+        mode: SamplePlaybackMode,
+    },
+
+    PlaybackOrder {
+        #[clap(arg_enum)]
+        bank: SampleBank,
+
+        #[clap(arg_enum)]
+        button: SampleButtons,
+
+        #[clap(arg_enum)]
+        mode: SamplePlayOrder,
+    },
+
+    StartPercent {
+        #[clap(arg_enum)]
+        bank: SampleBank,
+
+        #[clap(arg_enum)]
+        button: SampleButtons,
+
+        sample_id: usize,
+
+        #[clap(parse(try_from_str=percent_value_float))]
+        start_position: f32,
+    },
+
+    StopPercent {
+        #[clap(arg_enum)]
+        bank: SampleBank,
+
+        #[clap(arg_enum)]
+        button: SampleButtons,
+
+        sample_id: usize,
+
+        #[clap(parse(try_from_str=percent_value_float))]
+        stop_position: f32,
+    },
 }