Merge pull request #151 from GoXLR-on-Linux/dev-1.0.5

Dev 1.0.5

Author: FrostyCoolSlug

Cargo.lock

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

audio/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-client"
-version = "1.0.4"
+version = "1.0.5"
 edition = "2021"
 build = "build.rs"
 authors = ["Nathan Adams <[email protected]>", "Craig McLure <[email protected]>", "Lars Mühlbauer <[email protected]>"]

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-daemon"
-version = "1.0.4"
+version = "1.0.5"
 edition = "2021"
 authors = ["Nathan Adams <[email protected]>", "Craig McLure <[email protected]>", "Lars Mühlbauer <[email protected]>"]
 description = "Allows control of a TC-Helicon GoXLR or GoXLR Mini, by maintaining an interaction with it over USB in the background."
@@ -22,7 +22,7 @@ goxlr-scribbles = { path = "../scribbles" }
 log = "0.4.20"
 simplelog = "0.12.1"
 file-rotate = "0.7.5"
-log-panics = { version = "2.1.0", features = ["with-backtrace"]}
+log-panics = { version = "2.1.0", features = ["with-backtrace"] }
 
 tokio = { version = "1.35.0", features = ["full"] }
 tokio-serde = "0.8.0"
@@ -83,10 +83,20 @@ winrt-notification = "0.5.1"
 winreg = "0.52.0"
 mslnk = "0.1.8"
 dunce = "1.0.4"
-win-win = "0.1.1"
-winapi = { version = "0.3.9", features = ["winuser"] }
 windows-args = "0.2.0"
 
+# Experimental Package..
+windows = { version = "0.52.0", features = [
+    "Win32_Foundation",
+    "Win32_UI_Shell",
+    "Win32_UI_Shell_Common",
+    "Win32_UI_WindowsAndMessaging",
+    "Win32_Graphics_Gdi",
+    "Win32_System_LibraryLoader",
+    "Win32_System_Shutdown",
+    "Win32_System_RemoteDesktop"
+] }
+
 [target.'cfg(target_os = "macos")'.dependencies]
 
 # TAO has moved the tray feature to it's own crate, we need to work this in before we can update, 0.21.1 is the latest

daemon/Cargo.toml

@@ -2578,11 +2578,12 @@ impl<'a> Device<'a> {
                         self.profile.set_mute_chat_button_blink(false);
                     }
                     MuteState::MutedToAll => {
-                        self.profile.set_mute_chat_button_on(false);
+                        self.profile.set_mute_chat_button_on(true);
                         self.profile.set_mute_chat_button_blink(true);
                     }
                 }
                 self.apply_cough_from_profile()?;
+                self.apply_effects(LinkedHashSet::from_iter([EffectKey::MicInputMute]))?;
                 self.apply_routing(BasicInputDevice::Microphone).await?;
                 self.update_button_states()?;
             }

daemon/src/device.rs

@@ -68,9 +68,35 @@ pub struct PatchEvent {
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    let args: Cli = Cli::parse();
+    // If running the utility has an error, make sure log level is debug, and propagate the
+    // error up to the user on Windows.
+    if let Err(e) = run_utility().await {
+        let args: Cli = Cli::parse();
+        let settings = SettingsHandle::load(args.config).await?;
+
+        if settings.get_log_level().await != LogLevel::Debug {
+            info!("Setting Log Level to Debug for next run..");
+            settings.set_log_level(LogLevel::Debug).await;
+            settings.save().await;
+        }
+
+        #[cfg(target_os = "windows")]
+        {
+            use platform::windows::display_error;
+            let message = format!("Error Starting the GoXLR Utility:\r\n\r\n{}", e);
+            display_error(message);
+        }
+
+        bail!("{}", e);
+    }
 
-    // Before we do absolutely anything, we need to load the config file, as it implies log settings
+    Ok(())
+}
+
+async fn run_utility() -> Result<()> {
+    // We're just going to re-parse the args here, while we've technically done it above,
+    // they get moved into the settings loader, which just causes headaches :D
+    let args: Cli = Cli::parse();
     let settings = SettingsHandle::load(args.config).await?;
 
     // Configure and / or create the log path, and file name.
@@ -246,9 +272,9 @@ async fn main() -> Result<()> {
 
     // Spawn the IPC Socket..
     let ipc_socket = bind_socket().await;
-    if ipc_socket.is_err() {
-        error!("Error Starting Daemon: ");
-        bail!("{}", ipc_socket.err().unwrap());
+    if let Err(e) = ipc_socket {
+        error!("Error Binding IPC Socket: {}", e);
+        bail!("{}", e);
     }
 
     // Start the USB Device Handler
@@ -265,7 +291,7 @@ async fn main() -> Result<()> {
     ));
 
     // Launch the IPC Server..
-    let ipc_socket = ipc_socket.unwrap();
+    let ipc_socket = ipc_socket?;
     let communications_handle = tokio::spawn(spawn_ipc_server(
         ipc_socket,
         usb_tx.clone(),