complete image support

Author: wgibbs-rs

build.rs

@@ -18,8 +18,6 @@ fn main() {
             "AVFoundation",
             "-framework",
             "AppKit",
-            "-framework",
-            "Cocoa",
             "-o",
             &lib_path,
             swift_file,

examples/RustAudio.png

@@ -1,23 +1,24 @@
-use system_media::MediaSession;
-use std::fs;
 use std::thread;
 use std::time::Duration;
+use system_media::MediaSession;
 
 fn main() {
     println!("Now Playing session started");
     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 path = format!("{}/examples/RustAudio.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_title("Example Title");
+    session.set_artist("RustAudio");
+    session.set_album("Audio and Video");
 
-    session.set_image(&path);
+    session.set_image(&path).unwrap();
 
     session.start();
 }

examples/basic.rs

@@ -3,15 +3,15 @@ mod macos;
 #[cfg(not(any(target_os = "macos")))]
 mod null;
 
-use std::sync::{Arc, Mutex};
 use std::error::Error;
+use std::sync::{Arc, Mutex};
 
 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_image(&self, path: &str) -> Result<(), Box<dyn Error>>;
     fn set_media_type(&self, media_type: MediaType);
     fn set_playback_duration(&self, duration: f64);
     fn set_elapsed_duration(&self, duration: f64);
@@ -108,7 +108,7 @@ impl MediaSession {
 
     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);
+        self.backend.set_image(path)?;
         Ok(())
     }
 

examples/bug.png

@@ -0,0 +1 @@
+

src/lib.rs

@@ -1,6 +1,6 @@
 use crate::{MediaBackend, MediaType};
 use std::ffi::CString;
-use std::thread;
+use std::error::Error;
 
 // Swift functions called by Rust
 unsafe extern "C" {
@@ -64,12 +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();
+
+    fn set_image(&self, path: &str) -> Result<(), Box<dyn Error>> {
+        let data = std::fs::read(path)?;
         unsafe {
             swift_set_metadata_image(data.as_ptr(), data.len());
         }
+        Ok(())
     }
 
     fn set_media_type(&self, media_type: MediaType) {

src/linux/mod.rs

@@ -2,7 +2,6 @@ import Foundation
 import MediaPlayer
 import AVFoundation
 import AppKit
-import Cocoa
 
 @_silgen_name("rust_resume_playback_command")
 public func rustStartPlaybackCommand()
@@ -56,21 +55,6 @@ public func setMetadataGenre(genre : UnsafePointer<CChar>) {
     }
 }
 
-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 {
@@ -84,7 +68,7 @@ public func setMetadataImage(bytes: UnsafePointer<UInt8>, length: Int) {
             newImage.unlockFocus()
             return newImage
         }
-        
+
         var info = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [:]
         info[MPMediaItemPropertyArtwork] = artwork
         MPNowPlayingInfoCenter.default().nowPlayingInfo = info