feat(iOS): Support system media control

Losses · Jan 2, 2025 · ed3550e · ed3550e
1 parent 901bdc6
commit ed3550e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/playback/Cargo.toml b/playback/Cargo.toml
@@ -43,9 +43,9 @@ windows = { version = "0.44.0", features = [
 once_cell = "1.20.2"
 simple_channel = { path = "../simple-channel" }
 
-[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
-souvlaki = "0.7.3"
+[target.'cfg(not(any(target_os = "android")))'.dependencies]
+souvlaki = { git = "https://github.com/XMLHexagram/souvlaki", branch = "master" }
 
 [target.'cfg(target_os = "android")'.dependencies]
 ndk-context = "0.1.1"
-jni = "0.21.1"
+jni = "0.21.1"
diff --git a/playback/src/controller.rs b/playback/src/controller.rs
@@ -13,9 +13,10 @@ use log::{debug, info};
 use once_cell::sync::OnceCell;
 use tokio::sync::Mutex;
 
-#[cfg(any(target_os = "android", target_os = "ios"))]
+#[cfg(target_os = "android")]
 use crate::dummy_souvlaki::{MediaControlEvent, MediaControls, PlatformConfig, SeekDirection};
-#[cfg(not(any(target_os = "android", target_os = "ios")))]
+
+#[cfg(not(target_os = "android"))]
 use souvlaki::{MediaControlEvent, MediaControls, PlatformConfig, SeekDirection};
 
 use simple_channel::{SimpleChannel, SimpleReceiver, SimpleSender};
@@ -51,7 +52,7 @@ pub struct MediaControlManager {
 
 impl MediaControlManager {
     pub fn new() -> Result<Self> {
-        #[cfg(not(any(target_os = "windows", target_os = "android", target_os = "ios")))]
+        #[cfg(not(any(target_os = "windows")))]
         let hwnd = None;
 
         #[cfg(target_os = "windows")]
@@ -61,13 +62,9 @@ impl MediaControlManager {
             (Some(handle), dummy_window)
         };
 
-        // #[cfg(target_os = "android")]
-        // let hwnd = ();
-
         let config = PlatformConfig {
             dbus_name: "rune_player",
             display_name: "Rune",
-            #[cfg(not(any(target_os = "android", target_os = "ios")))]
             hwnd,
         };
 

diff --git a/playback/src/dummy_souvlaki.rs b/playback/src/dummy_souvlaki.rs
@@ -43,6 +43,7 @@ pub enum SeekDirection {
 pub struct PlatformConfig {
     pub dbus_name: &'static str,
     pub display_name: &'static str,
+    pub hwnd: Option<()>,
 }
 
 /// A platform-specific error.

diff --git a/playback/src/lib.rs b/playback/src/lib.rs
@@ -10,16 +10,16 @@ pub mod player;
 pub mod sfx_player;
 pub mod strategies;
 
-#[cfg(any(target_os = "android", target_os = "ios"))]
+#[cfg(target_os = "android")]
 mod dummy_souvlaki;
 
-#[cfg(not(any(target_os = "android", target_os = "ios")))]
-pub use souvlaki::{MediaMetadata, MediaPlayback, MediaPosition};
-
-#[cfg(any(target_os = "android", target_os = "ios"))]
+#[cfg(target_os = "android")]
 pub use dummy_souvlaki::{MediaMetadata, MediaPlayback, MediaPosition};
 
+#[cfg(not(target_os = "android"))]
+pub use souvlaki::{MediaMetadata, MediaPlayback, MediaPosition};
+
 pub use internal::{PlayerCommand, PlayerEvent};
 
 #[cfg(target_os = "android")]
-pub mod android_utils;
+pub mod android_utils;