fix: macos build, probably

WilliamAnimate · Jan 28, 2025 · e5da13b · e5da13b
1 parent 20f6b98
commit e5da13b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -150,8 +150,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
         // let has_dbus = media.attach(move |e| mpris_handler::on_media_event(e, mpris_mtx.clone()));
         let has_dbus = media.attach(mpris_mtx);
-        if has_dbus.is_err() {
-            eprintln!("Disabling mpris due to lack of dbus... at least, presumably.\n{:?}", has_dbus.err());
+        if has_dbus.is_none() {
+            eprintln!("Disabling mpris due to lack of dbus...");
             return;
         }
         loop {

diff --git a/src/mpris_handler.rs b/src/mpris_handler.rs
@@ -62,10 +62,13 @@ mod inner {
             self.controls.set_metadata(metadata).unwrap();
         }
 
-        pub fn attach(&mut self, tx: super::Tx) -> Result<(), Box<dyn std::error::Error>> {
-            self.controls.attach(move |ev| on_media_event(ev, tx.clone()))?;
+        pub fn attach(&mut self, tx: super::Tx) -> Option<()> {
+            let attach = self.controls.attach(move |ev| on_media_event(ev, tx.clone()));
+            if attach.is_err() {
+                return None;
+            }
 
-            Ok(())
+            Some(())
         }
     }
 
@@ -97,8 +100,8 @@ mod inner {
 
         #[inline] pub fn update(&mut self) { }
 
-        #[inline] pub fn attach(&mut self, _tx: Arc<mpsc::Sender<encore::SongControl>>) -> Result<(), Box<dyn std::error::Error>> {
-            Err("Unsupported at compile time".into())
+        #[inline] pub fn attach(&mut self, _tx: Arc<mpsc::Sender<encore::SongControl>>) -> Option<()> {
+            None
         }
     }
 }
@@ -121,7 +124,7 @@ impl MediaInfo {
         self.inner.update();
     }
 
-    pub fn attach(&mut self, tx: Tx) -> Result<(), Box<dyn std::error::Error>> {
+    pub fn attach(&mut self, tx: Tx) -> Option<()> {
         self.inner.attach(tx)
     }
 }