stability update

Author: wgibbs-rs

Cargo.lock

@@ -1,12 +1,15 @@
 [package]
-name = "system_media"
+name = "system-media"
 version = "0.1.0"
 edition = "2024"
 
 authors = ["William Gibbs <[email protected]>"]
 description = "Rust crate for interacting with the NowPlaying API"
 license = "MIT"
-repository = "https://github.com/wgibbs-rs/system_media"
+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

@@ -1,2 +1,2 @@
-# system_media
+# system-media
 Rust library for creating and interacting with system media sessions

README.md

@@ -16,6 +16,10 @@ fn main() {
             "MediaPlayer",
             "-framework",
             "AVFoundation",
+            "-framework",
+            "AppKit",
+            "-framework",
+            "Cocoa",
             "-o",
             &lib_path,
             swift_file,

build.rs

@@ -1,9 +1,23 @@
 use system_media::MediaSession;
+use std::fs;
+use std::thread;
+use std::time::Duration;
 
 fn main() {
     println!("Now Playing session started");
     println!("Keeping process alive... Press Ctrl+C to exit");
     let mut session = MediaSession::new();
-    session.set_title("Hello!");
+
+    // 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.start();
 }

examples/basic.rs

@@ -4,12 +4,15 @@ mod macos;
 mod null;
 
 use std::sync::{Arc, Mutex};
+use std::error::Error;
+use image::ImageReader;
 
 pub trait MediaBackend {
     fn set_title(&self, title: &str);
     fn set_artist(&self, artist: &str);
     fn set_album(&self, album: &str);
     fn set_genre(&self, genre: &str);
+    fn set_image(&self, path: &str);
     fn set_media_type(&self, media_type: MediaType);
     fn set_playback_duration(&self, duration: f64);
     fn set_elapsed_duration(&self, duration: f64);
@@ -30,11 +33,19 @@ pub struct Metadata {
     artist: String,
     album: String,
     genre: String,
+    image_path: String,
     media_type: MediaType,
     duration: f64,
     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>>,
@@ -55,6 +66,7 @@ impl MediaSession {
                 artist: "".to_string(),
                 album: "".to_string(),
                 genre: "".to_string(),
+                image_path: "".to_string(),
                 media_type: MediaType::Audio,
                 duration: 0.0,
                 playback_rate: 0.0,
@@ -102,6 +114,17 @@ impl MediaSession {
         md.genre.clone()
     }
 
+    pub fn set_image(&mut self, path: &str) -> Result<(), Box<dyn Error>> {
+        Arc::clone(&self.metadata).lock().unwrap().image_path = path.to_string();
+        self.backend.set_image(path);
+        Ok(())
+    }
+
+    pub fn image(&self) -> String {
+        let md = self.metadata.lock().unwrap();
+        md.image_path.clone()
+    }
+
     pub fn set_media_type(&mut self, media_type: MediaType) {
         Arc::clone(&self.metadata).lock().unwrap().media_type = media_type;
         self.backend.set_media_type(media_type);

examples/bug.png

@@ -1,12 +1,14 @@
 use crate::{MediaBackend, MediaType};
 use std::ffi::CString;
+use std::thread;
 
 // Swift functions called by Rust
 unsafe extern "C" {
     fn swift_set_metadata_title(title: *mut i8);
     fn swift_set_metadata_artist(artist: *mut i8);
     fn swift_set_metadata_album(album: *mut i8);
     fn swift_set_metadata_genre(genre: *mut i8);
+    fn swift_set_metadata_image(bytes: *const u8, length: usize);
     fn swift_set_metadata_media_type(id: i64);
     fn swift_set_playback_duration(seconds: f64);
     fn swift_set_elapsed_duration(seconds: f64);
@@ -62,6 +64,13 @@ impl MediaBackend for NowPlayingBackend {
             swift_set_metadata_genre(str_to_raw(genre));
         }
     }
+    
+    fn set_image(&self, path: &str) {
+        let data = std::fs::read(path).unwrap();
+        unsafe {
+            swift_set_metadata_image(data.as_ptr(), data.len());
+        }
+    }
 
     fn set_media_type(&self, media_type: MediaType) {
         unsafe {

src/lib.rs

@@ -1,6 +1,8 @@
 import Foundation
 import MediaPlayer
 import AVFoundation
+import AppKit
+import Cocoa
 
 @_silgen_name("rust_resume_playback_command")
 public func rustStartPlaybackCommand()
@@ -16,73 +18,121 @@ public func rustPreviousTrackCommand()
 
 @_cdecl("swift_set_metadata_title")
 public func setMetadataTitle(title : UnsafePointer<CChar>) {
-    let s = String(cString: title)
-    var nowPlayingInfo = [String: Any]()
-    nowPlayingInfo[MPMediaItemPropertyTitle] = s
-    MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+    DispatchQueue.main.async {
+        let s = String(cString: title)
+        var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()
+        nowPlayingInfo[MPMediaItemPropertyTitle] = s
+        MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+    }
 }
 
 @_cdecl("swift_set_metadata_artist")
 public func setMetadataArtist(artist : UnsafePointer<CChar>) {
-    let s = String(cString: artist)
-    var nowPlayingInfo = [String: Any]()
-    nowPlayingInfo[MPMediaItemPropertyArtist] = s
-    MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+    DispatchQueue.main.async {
+        let s = String(cString: artist)
+        var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()
+        nowPlayingInfo[MPMediaItemPropertyArtist] = s
+        MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+    }
 }
 
 @_cdecl("swift_set_metadata_album")
 public func setMetadataAlbumTitle(album : UnsafePointer<CChar>) {
-    let s = String(cString: album)
-    var nowPlayingInfo = [String: Any]()
-    nowPlayingInfo[MPMediaItemPropertyAlbumTitle] = s
-    MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+    DispatchQueue.main.async {
+        let s = String(cString: album)
+        var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()
+        nowPlayingInfo[MPMediaItemPropertyAlbumTitle] = s
+        MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+    }
 }
 
 @_cdecl("swift_set_metadata_genre")
 public func setMetadataGenre(genre : UnsafePointer<CChar>) {
-    let s = String(cString: genre)
-    var nowPlayingInfo = [String: Any]()
-    nowPlayingInfo[MPMediaItemPropertyGenre] = s
-    MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+    DispatchQueue.main.async {
+        let s = String(cString: genre)
+        var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()
+        nowPlayingInfo[MPMediaItemPropertyGenre] = s
+        MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+    }
+}
+
+func resize(image: NSImage, to newSize: NSSize) -> NSImage {
+    let resizedImage = NSImage(size: newSize)
+    resizedImage.lockFocus()
+    defer { resizedImage.unlockFocus() }
+
+    image.draw(
+        in: NSRect(origin: .zero, size: newSize),
+        from: NSRect(origin: .zero, size: image.size),
+        operation: .copy,
+        fraction: 1.0
+    )
+
+    return resizedImage
+}
+
+@_cdecl("swift_set_metadata_image")
+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
+        }
+        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
+    }
 }
 
 @_cdecl("swift_set_metadata_media_type")
 public func setMetadataMediaType(id: Int) {
-    var nowPlayingInfo = [String: Any]()
-    if (id == 0) {
-        nowPlayingInfo[MPNowPlayingInfoPropertyMediaType] = MPNowPlayingInfoMediaType.audio.rawValue
-    } else {
-        nowPlayingInfo[MPNowPlayingInfoPropertyMediaType] = MPNowPlayingInfoMediaType.video.rawValue
+    DispatchQueue.main.async {
+        var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()
+        if (id == 0) {
+            nowPlayingInfo[MPNowPlayingInfoPropertyMediaType] = MPNowPlayingInfoMediaType.audio.rawValue
+        } else {
+            nowPlayingInfo[MPNowPlayingInfoPropertyMediaType] = MPNowPlayingInfoMediaType.video.rawValue
+        }
+        MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
     }
-    MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
 }
 
 @_cdecl("swift_set_playback_duration")
 public func setPlaybackDuration(seconds : Double) {
-    var nowPlayingInfo = [String: Any]()
-    nowPlayingInfo[MPMediaItemPropertyPlaybackDuration] = seconds
-    MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+    DispatchQueue.main.async {
+        var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()
+        nowPlayingInfo[MPMediaItemPropertyPlaybackDuration] = seconds
+        MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+    }
 }
 
 @_cdecl("swift_set_elapsed_duration")
 public func setElapsedPlaybackTime(seconds : Double) {
-    var nowPlayingInfo = [String: Any]()
-    nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = seconds
-    MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+    DispatchQueue.main.async {
+        var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()
+        nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = seconds
+        MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+    }
 }
 
 @_cdecl("swift_set_playback_rate")
 public func setPlaybackRate(rate : Double) {
-    var nowPlayingInfo = [String: Any]()
-    nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = rate
-    MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+    DispatchQueue.main.async {
+        var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()
+        nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = rate
+        MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+    }
 }
 
 @_cdecl("swift_start_session")
 public func startSession() {
     setupRemoteCommandTargets()     // Create event hooks for media session.
-    setPlaybackRate(rate: 0.0)      // Ensures NowPlaying is properly displayed.
-    RunLoop.main.run()              // Loop the thread indefinitely; until killed.
+    RunLoop.main.run()              // Loop the thread indefinitely until killed.
 }
 
 private func setupRemoteCommandTargets() {