macos fixes

src/main.rs

@@ -55,11 +55,11 @@ fn get_providers(data_sender: &broadcast::Sender<Vec<u8>>) -> Vec<Box<dyn Provid
 }
 
 #[cfg(target_os = "macos")]
-fn get_providers(data_sender: &broadcast::Sender<Vec<u8>>, layouts: Vec<String>) -> Vec<Box<dyn Provider>> {
+fn get_providers(data_sender: &broadcast::Sender<Vec<u8>>) -> Vec<Box<dyn Provider>> {
     return vec![
         TimeProvider::new(data_sender.clone()),
         VolumeProvider::new(data_sender.clone()),
-        LayoutProvider::new(data_sender.clone(), layouts),
+        LayoutProvider::new(data_sender.clone()),
     ];
 }
 

src/providers/layout/macos.rs

@@ -77,24 +77,25 @@ impl Provider for LayoutProvider {
         let is_started = self.is_started.clone();
         let mut synced_layout = "".to_string();
 
-        std::thread::spawn(move || {
-            let mut connected_receiver = connected_sender.subscribe();
-            loop {
-                if !is_started.load(Relaxed) {
-                    break;
-                }
+        std::thread::spawn(move || loop {
+            if !is_started.load(Relaxed) {
+                break;
+            }
 
-                if let Some(layout) = get_keyboard_layout() {
-                    let lang = layout.split('.').last().unwrap().to_string();
-                    if synced_layout != lang {
-                        synced_layout = lang;
-                        send_data(&synced_layout, &layouts, &data_sender);
-                    }
+            if let Some(layout) = get_keyboard_layout() {
+                let lang = layout.split('.').last().unwrap().to_string();
+                if synced_layout != lang {
+                    synced_layout = lang;
+                    send_data(&synced_layout, &layouts, &data_sender);
                 }
-                std::thread::sleep(std::time::Duration::from_millis(100));
             }
+            std::thread::sleep(std::time::Duration::from_millis(100));
         });
 
         tracing::info!("Layout Provider stopped");
     }
+
+    fn stop(&self) {
+        self.is_started.store(false, Relaxed);
+    }
 }

src/providers/volume/macos.rs

@@ -174,7 +174,7 @@ pub struct VolumeProvider {
 }
 
 impl VolumeProvider {
-    pub fn new(data_sender: mpsc::Sender<Vec<u8>>) -> Box<dyn Provider> {
+    pub fn new(data_sender: broadcast::Sender<Vec<u8>>) -> Box<dyn Provider> {
         let sender = data_sender.clone();
         let volume_changed_block = RcBlock::new(move |_: u32, _: u64| {
             if let Some(volume) = get_current_volume() {