added support for image icons

Author: wgibbs-rs

Cargo.lock

@@ -10,6 +10,3 @@ repository = "https://github.com/RustAudio/system-media"
 readme = "README.md"
 keywords = ["rust", "swift", "macos", "audio", "video"]
 categories = ["external-ffi-bindings", "multimedia::audio", "multimedia::video"]
-
-[dependencies]
-image = "0.25.6"

Cargo.toml

@@ -8,16 +8,16 @@ fn main() {
     println!("Keeping process alive... Press Ctrl+C to exit");
     let mut session = MediaSession::new();
 
-    // let manifest_dir = env!("CARGO_MANIFEST_DIR");
-    // let path = format!("{}/examples/bug.png", manifest_dir);
+    let manifest_dir = env!("CARGO_MANIFEST_DIR");
+    let path = format!("{}/examples/bug.png", manifest_dir);
 
     session.set_playback_rate(1.0);
     session.set_playback_duration(300.0);
     session.set_elapsed_duration(100.0);
 
     session.set_title("Help ME!");
 
-    // session.set_image(&path);
+    session.set_image(&path);
 
     session.start();
 }

examples/basic.rs

@@ -5,7 +5,6 @@ mod null;
 
 use std::sync::{Arc, Mutex};
 use std::error::Error;
-use image::ImageReader;
 
 pub trait MediaBackend {
     fn set_title(&self, title: &str);
@@ -39,13 +38,6 @@ pub struct Metadata {
     playback_rate: f64,
 }
 
-fn decode_image(path: &str) -> Result<Vec<u8>, Box<dyn Error>> {
-    let img = ImageReader::open(path)?
-        .decode()?
-        .to_rgb8();
-    Ok(img.into_raw())
-}
-
 pub struct MediaSession {
     backend: Box<dyn MediaBackend>,
     metadata: Arc<Mutex<Metadata>>,

src/lib.rs

@@ -0,0 +1 @@
+

src/linux/mod.rs

@@ -75,17 +75,19 @@ func resize(image: NSImage, to newSize: NSSize) -> NSImage {
 public func setMetadataImage(bytes: UnsafePointer<UInt8>, length: Int) {
     DispatchQueue.main.async {
         let data = Data(bytes: bytes, count: length)
-        guard let image = NSImage(data: data) else {
-            print("Failed to convert data to NSImage")
-            return
+        guard let image = NSImage(data: data) else { return }
+        
+        let artwork = MPMediaItemArtwork(boundsSize: image.size) { size in
+            let newImage = NSImage(size: size)
+            newImage.lockFocus()
+            image.draw(in: NSRect(origin: .zero, size: size))
+            newImage.unlockFocus()
+            return newImage
         }
-        let scaledImg = resize(image: image, to: NSSize(width: 512, height: 512))
-        let artwork = MPMediaItemArtwork(boundsSize: image.size) { _ in
-            return scaledImg
-        }
-        var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()
-        nowPlayingInfo[MPMediaItemPropertyArtwork] = artwork
-        MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+        
+        var info = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [:]
+        info[MPMediaItemPropertyArtwork] = artwork
+        MPNowPlayingInfoCenter.default().nowPlayingInfo = info
     }
 }
 

src/linux/mpris.rs

@@ -0,0 +1 @@
+// This file will contain bindings to the SMTC API. This has not yet been implemented.