fix: macos volumes

thewh1teagle · Nov 25, 2023 · d19bc99 · d19bc99
1 parent dd73c28
commit d19bc99
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml
@@ -17,6 +17,7 @@ tauri = { version = "1.4", features = ["shell-open", "devtools"] }
 enigo = { version = "0.2.0-rc2" }
 env_logger = "0.10"
 log = "0.4.20"
+cfg-if = "1.0.0"
 
 
 [target.'cfg(any(windows, target_os = "macos"))'.dependencies]

diff --git a/desktop/src-tauri/src/main.rs b/desktop/src-tauri/src/main.rs
@@ -8,16 +8,67 @@ use enigo::{Direction, Enigo, Key, Keyboard, Settings};
 use log::debug;
 use tauri::Manager;
 
+cfg_if::cfg_if! {
+    if #[cfg(target_os = "macos")] {
+        use log::error;
+        use std::process::Command;
+
+        fn osx_volume_up() {
+            let output = Command::new("osascript")
+                .args(&[
+                    "-e",
+                    "set Outputvol to output volume of (get volume settings)",
+                    "-e",
+                    "set volume output volume (Outputvol + 6.25)",
+                ])
+                .output()
+                .expect("Failed to execute command");
+
+            if !output.status.success() {
+                error!("{output:?}");
+            }
+        }
+
+        fn osx_volume_down() {
+            let output = Command::new("osascript")
+            .args(&[
+                "-e",
+                "set Outputvol to output volume of (get volume settings)",
+                "-e",
+                "set volume output volume (Outputvol - 6.25)",
+            ])
+            .output()
+            .expect("Failed to execute command");
+
+            if !output.status.success() {
+                error!("{output:?}");
+            }
+        }
+    }
+}
+
 #[tauri::command]
 async fn press(key: String) -> Result<(), String> {
     let mut enigo = Enigo::new(&Settings::default()).unwrap();
     debug!("Pressing {}", key);
     match key.as_str() {
         "VOL_UP" => {
-            enigo.key(Key::VolumeUp, Direction::Click).unwrap();
+            cfg_if::cfg_if! {
+                if #[cfg(target_os = "macos")] {
+                    osx_volume_up();
+                } else {
+                    enigo.key(Key::VolumeUp, Direction::Click).unwrap();
+                }
+            }
         }
         "VOL_DN" => {
-            enigo.key(Key::VolumeDown, Direction::Click).unwrap();
+            cfg_if::cfg_if! {
+                if #[cfg(target_os = "macos")] {
+                    osx_volume_down();
+                } else {
+                    enigo.key(Key::VolumeDown, Direction::Click).unwrap();
+                }
+            }
         }
         "PG_UP" => {
             enigo.key(Key::PageUp, Direction::Click).unwrap();