Mid-way MPRIS refactor and permissions

Not working yet. Need to debug

Author: Sinono3

docs/specbook/src/mpris.md

@@ -7,7 +7,7 @@ Sources:
 
 - Some desktop environments natively support image data URLs in `mpris:artUrl`,
 	but we have no way to verify this via the specification as it is.
-	Using HTTP URLs or local file URLs is safer.
+	Using local file URLs or alternatively HTTP URLs may be safer.
 
 ## org.mpris.MediaPlayer2
 

examples/player.rs

@@ -103,10 +103,25 @@ fn main() {
     let (config, permissions) = {
         (
             souvlaki::platform::mpris::MprisConfig {
-                display_name: "Souvlaki Player".to_owned(),
+                identity: "Souvlaki Player".to_owned(),
                 dbus_name: "souvlaki_player".to_owned(),
+                desktop_entry: "souvlaki".to_owned(),
+            },
+            souvlaki::platform::mpris::MprisPermissions {
+                can_quit: true,
+                can_set_fullscreen: false,
+                can_raise: true,
+                supported_uri_schemes: vec![],
+                supported_mime_types: vec![],
+                can_go_next: true,
+                can_go_previous: true,
+                can_play: true,
+                can_pause: true,
+                can_seek: true,
+                can_control: true,
+                min_rate: 1.0,
+                max_rate: 1.0,
             },
-            (),
         )
     };
 
@@ -295,6 +310,7 @@ fn main() {
                             eprintln!("Quitting...");
                             return;
                         }
+                        SetFullscreen(_) => todo!(),
                         FastForward => todo!(),
                         Rewind => todo!(),
                         ChannelUp => todo!(),

examples/print_events.rs

@@ -11,10 +11,25 @@ fn main() {
     let (config, permissions) = {
         (
             souvlaki::platform::mpris::MprisConfig {
-                display_name: "Souvlaki Player".to_owned(),
+                identity: "Souvlaki Player".to_owned(),
                 dbus_name: "souvlaki_player".to_owned(),
+                desktop_entry: "souvlaki".to_owned(),
+            },
+            souvlaki::platform::mpris::MprisPermissions {
+                can_quit: true,
+                can_set_fullscreen: true,
+                can_raise: true,
+                supported_uri_schemes: vec![],
+                supported_mime_types: vec![],
+                can_go_next: true,
+                can_go_previous: true,
+                can_play: true,
+                can_pause: true,
+                can_seek: true,
+                can_control: true,
+                min_rate: 1.0,
+                max_rate: 1.0,
             },
-            (),
         )
     };
 

src/controls.rs

@@ -34,11 +34,8 @@ pub trait MediaControls: Sized + Debug {
     fn set_volume(&mut self, volume: f64) -> Result<(), Self::Error>;
     /// Set the playback rate, e.g. 0.5x, 1.0x, 2.0x.
     fn set_rate(&mut self, rate: f64) -> Result<(), Self::Error>;
-    /// Set the maximum allowed playback rate.
-    /// - max: should always be 1.0 or more
-    /// - min: should always be 1.0 or less
-    /// Only events received within these limits will be sent to the application handler.
-    fn set_rate_limits(&mut self, min: f64, max: f64) -> Result<(), Self::Error>;
+    /// Set whether the app is fullscreen.
+    fn set_fullscreen(&mut self, rate: bool) -> Result<(), Self::Error>;
 }
 
 /// NOTE: Use this wrapper instead of the platform-specific control structs.
@@ -93,8 +90,8 @@ impl<T: MediaControls> MediaControls for MediaControlsWrapper<T> {
     fn set_rate(&mut self, rate: f64) -> Result<(), T::Error> {
         self.inner.set_rate(rate)
     }
-    fn set_rate_limits(&mut self, min: f64, max: f64) -> Result<(), T::Error> {
-        self.inner.set_rate_limits(min, max)
+    fn set_fullscreen(&mut self, fullscreen: bool) -> Result<(), T::Error> {
+        self.inner.set_fullscreen(fullscreen)
     }
 }
 

src/lib.rs

@@ -1,5 +1,6 @@
 #![doc = include_str!("../README.md")]
 
+use std::convert::TryFrom;
 use std::{fmt::Debug, time::Duration};
 
 mod controls;
@@ -28,6 +29,9 @@ pub enum MediaControlEvent {
     /// Seek forward or backward by a certain amount.
     SeekBy(SeekDirection, Duration),
     /// Set the position/progress of the currently playing media item.
+    /// **NOTE**: If the request was handled, and the property
+    /// was changed, [`MediaControls::set_playback`] must be called
+    /// with the new progress value.
     SetPosition(MediaPosition),
     /// Set the volume. The value is intended to be from 0.0 to 1.0.
     /// But other values are also accepted. **It is up to the
@@ -59,6 +63,11 @@ pub enum MediaControlEvent {
     Raise,
     /// Shut down the media player.
     Quit,
+    /// Control whether the app is fullscreen or not
+    /// **NOTE**: If the request was handled, and the property
+    /// was changed, [`MediaControls::set_fullscreen`] must be called
+    /// with the new value.
+    SetFullscreen(bool),
 
     /// Windows-specific
     FastForward,
@@ -87,6 +96,18 @@ impl MediaPlayback {
             Stopped => "Stopped",
         }
     }
+    pub fn to_micros(&self) -> i64 {
+        i64::try_from(match self {
+            MediaPlayback::Playing {
+                progress: Some(progress),
+            }
+            | MediaPlayback::Paused {
+                progress: Some(progress),
+            } => progress.0.as_micros(),
+            _ => 0,
+        })
+        .unwrap_or(0)
+    }
 }
 
 /// A repeat/loop status

src/platform/apple/mod.rs

@@ -199,11 +199,6 @@ impl MediaControls for Apple {
         // unsupported, ignoring.
         Ok(())
     }
-
-    fn set_rate_limits(&mut self, _min: f64, _max: f64) -> Result<(), Self::Error> {
-        // unsupported, ignoring.
-        Ok(())
-    }
 }
 
 // MPNowPlayingPlaybackState