remove mpris feature

Author: ptixed

CHANGELOG.md

@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Special color for unavailable items
 - changelog with all the relevant user-facing changes to the project
-- Media control keys support for Windows and macOS
+- Replaced `mpris` with `media_control` feature providing universal support for media keys
 
 ### Changed
 

Cargo.lock

@@ -61,7 +61,6 @@ toml = "0.8"
 unicode-width = "0.1.9"
 url = "2.2"
 winit = { version = "0.28.6", optional = true }
-zbus = {version = "3.11.1", default-features = false, features = ["tokio"], optional = true}
 
 [target.'cfg(target_os = "linux")'.dependencies]
 wl-clipboard-rs = {version = "0.8", optional = true}
@@ -81,7 +80,7 @@ version = "0.20.0"
 [dependencies.notify-rust]
 default-features = false
 version = "4"
-# Use zbus, which we already depend on, instead of dbus.
+# Use zbus
 features = ["z"]
 optional = true
 
@@ -100,7 +99,6 @@ alsa_backend = ["librespot-playback/alsa-backend"]
 cover = ["ioctl-rs"] # Support displaying the album cover
 default = ["share_clipboard", "pulseaudio_backend", "media_control", "notify", "crossterm_backend"]
 media_control = ["souvlaki", "winit", "windows"]
-mpris = ["zbus"] # Allow ncspot to be controlled via MPRIS API
 ncurses_backend = ["cursive/ncurses-backend"]
 notify = ["notify-rust"] # Show what's playing via a notification
 crossterm_backend = ["cursive/crossterm-backend"]

Cargo.toml

@@ -72,13 +72,12 @@ cargo build --no-default-features --features rodio_backend,pancurses_backend,med
 ## Other Features
 Here are some auxiliary features you may wish to enable:
 
-| Feature           | Default | Description                                                                                |
-|-------------------|---------|--------------------------------------------------------------------------------------------|
-| `cover`           | off     | Add a screen to show the album art.                                                        |
-| `media_control`   | on      | Control `ncspot` via media keys.                                                           |
-| `mpris`           | off     | Control `ncspot` via dbus. See [Arch Wiki: MPRIS](https://wiki.archlinux.org/title/MPRIS). |
-| `notify`          | on      | Send a notification to show what's playing.                                                |
-| `share_clipboard` | on      | Ability to copy the URL of a song/playlist/etc. to system clipboard.                       |
+| Feature           | Default | Description                                                          |
+|-------------------|---------|----------------------------------------------------------------------|
+| `cover`           | off     | Add a screen to show the album art.                                  |
+| `media_control`   | on      | Control `ncspot` via media keys.                                     |
+| `notify`          | on      | Send a notification to show what's playing.                          |
+| `share_clipboard` | on      | Ability to copy the URL of a song/playlist/etc. to system clipboard. |
 
 Consult [Cargo.toml](/Cargo.toml) for the full list of supported features.
 

doc/developers.md

@@ -55,7 +55,7 @@ cargo install --locked ncspot
 
 ## Key Bindings
 The keybindings listed below are configured by default. Additionally, if you
-built `ncspot` with `media_control` or `mpris` feature, you may be able to use media keys to control
+built `ncspot` with `media_control` feature, you may be able to use media keys to control
 playback depending on your desktop environment settings. Have a look at the
 [configuration section](#configuration) if you want to set custom bindings.
 
@@ -180,7 +180,7 @@ Note: \<FOO\> - mandatory arg; [BAR] - optional arg
 | `save [current]`                                                 | Save selected item, if `current` is passed the currently playing item will be saved                                                                                                                                                                             |
 
 ## Remote control (IPC)
-Apart from MPRIS, ncspot will also create a domain socket on UNIX platforms (Linux, macOS, *BSD).
+Application will create a domain socket on UNIX platforms (Linux, macOS, *BSD).
 The socket will be created in the platform's runtime directory. If XDG_RUNTIME_DIR is set, it will
 be created under `$XDG_RUNTIME_DIR/ncspot`. If XDG_RUNTIME_DIR isn't set, it will be created under
 `/run/user/<uid>` for Linux if it exists. In all other cases, it will be created under

doc/users.md

@@ -23,9 +23,6 @@ use crate::{command, queue, spotify};
 #[cfg(feature = "media_control")]
 use crate::media_control::{self, MediaControlManager};
 
-#[cfg(feature = "mpris")]
-use crate::mpris::{self, MprisManager};
-
 #[cfg(unix)]
 use crate::ipc::{self, IpcSocket};
 
@@ -73,9 +70,6 @@ pub struct Application {
     /// Use media control keys using souvlaki.
     #[cfg(feature = "media_control")]
     media_control_manager: MediaControlManager,
-    /// An IPC implementation using the D-Bus MPRIS protocol, used to control and inspect ncspot.
-    #[cfg(feature = "mpris")]
-    mpris_manager: MprisManager,
     /// An IPC implementation using a Unix domain socket, used to control and inspect ncspot.
     #[cfg(unix)]
     ipc: IpcSocket,
@@ -140,14 +134,6 @@ impl Application {
             media_control::MediaControlManager::new(spotify.clone(), queue.clone())
                 .map_err(|err| -> String { format!("media_control error {err:?}") })?;
 
-        #[cfg(feature = "mpris")]
-        let mpris_manager = mpris::MprisManager::new(
-            event_manager.clone(),
-            queue.clone(),
-            library.clone(),
-            spotify.clone(),
-        );
-
         #[cfg(unix)]
         let ipc = ipc::IpcSocket::new(
             ASYNC_RUNTIME.get().unwrap().handle(),
@@ -213,8 +199,6 @@ impl Application {
             event_manager,
             #[cfg(feature = "media_control")]
             media_control_manager,
-            #[cfg(feature = "mpris")]
-            mpris_manager,
             #[cfg(unix)]
             ipc,
             cursive,
@@ -248,9 +232,6 @@ impl Application {
                         #[cfg(feature = "media_control")]
                         self.media_control_manager.update();
 
-                        #[cfg(feature = "mpris")]
-                        self.mpris_manager.update();
-
                         #[cfg(unix)]
                         self.ipc.publish(&state, self.queue.get_current());
 

src/application.rs

@@ -39,9 +39,6 @@ mod ipc;
 #[cfg(feature = "media_control")]
 mod media_control;
 
-#[cfg(feature = "mpris")]
-mod mpris;
-
 fn main() -> Result<(), String> {
     // Set a custom backtrace hook that writes the backtrace to a file instead of stdout, since
     // stdout is most likely in use by Cursive.