Merge pull request #108 from tsirysndr/fix/mpris-identity

tsirysndr · web-flow · commit 8a903ddf9e53 · 2025-01-27T20:22:29.000+03:00
fix(mpris): handle mpris play_pause function and set app identity
diff --git a/README.md b/README.md
@@ -124,9 +124,9 @@ curl -fsSL https://raw.githubusercontent.com/tsirysndr/rockbox-zig/HEAD/install.
 ## 📦 Downloads
 
 - `Linux`: intel:
-  [rockbox_2025.01.26_x86_64-linux.tar.gz](https://github.com/tsirysndr/rockbox-zig/releases/download/2025.01.26/rockbox_2025.01.26_x86_64-linux.tar.gz)
+  [rockbox_2025.01.27_x86_64-linux.tar.gz](https://github.com/tsirysndr/rockbox-zig/releases/download/2025.01.27/rockbox_2025.01.27_x86_64-linux.tar.gz)
   arm64:
-  [rockbox_2025.01.26_aarch64-linux.tar.gz](https://github.com/tsirysndr/rockbox-zig/releases/download/2025.01.26/rockbox_2025.01.26_aarch64-linux.tar.gz)
+  [rockbox_2025.01.27_aarch64-linux.tar.gz](https://github.com/tsirysndr/rockbox-zig/releases/download/2025.01.27/rockbox_2025.01.27_aarch64-linux.tar.gz)
 
 ## 🧙‍♂️ Systemd Service
 
@@ -161,14 +161,13 @@ your operating system.
 ### On Ubuntu/Debian
 
 ```bash
-sudo apt-get install libusb-dev libsdl2-dev libfreetype6-dev libunwind-dev zip protobuf-compiler cmake
+sudo apt-get install libsdl2-dev libfreetype6-dev libunwind-dev zip protobuf-compiler cmake
 ```
 
 ### On Fedora40/41:
 
 ```sh
-sudo dnf install libusb1-devel SDL2-devel freetype-devel libunwind-devel zip protobuf-compiler cmake
-sudo ln -s /lib64/libusb-1.0.so /usr/lib64/libusb.so
+sudo dnf install SDL2-devel freetype-devel libunwind-devel zip protobuf-compiler cmake
 ```
 
 ### Build Instructions
diff --git a/cli/src/api/rockbox.v1alpha1.rs b/cli/src/api/rockbox.v1alpha1.rs
@@ -2060,6 +2060,10 @@ pub struct PlayResponse {}
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct PauseRequest {}
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
+pub struct PlayOrPauseRequest {}
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+pub struct PlayOrPauseResponse {}
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct PauseResponse {}
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ResumeRequest {}
@@ -2421,6 +2425,32 @@ pub mod playback_service_client {
                 .insert(GrpcMethod::new("rockbox.v1alpha1.PlaybackService", "Pause"));
             self.inner.unary(req, path, codec).await
         }
+        pub async fn play_or_pause(
+            &mut self,
+            request: impl tonic::IntoRequest<super::PlayOrPauseRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::PlayOrPauseResponse>,
+            tonic::Status,
+        > {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/rockbox.v1alpha1.PlaybackService/PlayOrPause",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(
+                    GrpcMethod::new("rockbox.v1alpha1.PlaybackService", "PlayOrPause"),
+                );
+            self.inner.unary(req, path, codec).await
+        }
         pub async fn resume(
             &mut self,
             request: impl tonic::IntoRequest<super::ResumeRequest>,
@@ -2963,6 +2993,13 @@ pub mod playback_service_server {
             &self,
             request: tonic::Request<super::PauseRequest>,
         ) -> std::result::Result<tonic::Response<super::PauseResponse>, tonic::Status>;
+        async fn play_or_pause(
+            &self,
+            request: tonic::Request<super::PlayOrPauseRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::PlayOrPauseResponse>,
+            tonic::Status,
+        >;
         async fn resume(
             &self,
             request: tonic::Request<super::ResumeRequest>,
@@ -3277,6 +3314,51 @@ pub mod playback_service_server {
                     };
                     Box::pin(fut)
                 }
+                "/rockbox.v1alpha1.PlaybackService/PlayOrPause" => {
+                    #[allow(non_camel_case_types)]
+                    struct PlayOrPauseSvc<T: PlaybackService>(pub Arc<T>);
+                    impl<
+                        T: PlaybackService,
+                    > tonic::server::UnaryService<super::PlayOrPauseRequest>
+                    for PlayOrPauseSvc<T> {
+                        type Response = super::PlayOrPauseResponse;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::PlayOrPauseRequest>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as PlaybackService>::play_or_pause(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = PlayOrPauseSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
                 "/rockbox.v1alpha1.PlaybackService/Resume" => {
                     #[allow(non_camel_case_types)]
                     struct ResumeSvc<T: PlaybackService>(pub Arc<T>);
diff --git a/cli/src/api/rockbox_descriptor.bin b/cli/src/api/rockbox_descriptor.bin
diff --git a/crates/mpris/src/lib.rs b/crates/mpris/src/lib.rs
@@ -12,6 +12,7 @@ use rockbox_rpc::api::rockbox::v1alpha1::{
     sound_service_client::SoundServiceClient, AdjustVolumeRequest, GetGlobalSettingsRequest,
     HardStopRequest, NextRequest, PauseRequest, PlayRequest, PlayTrackRequest, PreviousRequest,
     ResumeRequest, SaveSettingsRequest,
+    PlayOrPauseRequest,
 };
 use tokio::sync::Mutex;
 
@@ -50,6 +51,8 @@ impl MprisServer {
             .build()
             .await?;
 
+       player.set_identity("Rockbox").await?; 
+
         connect_player_action!(
             player,
             client,
@@ -60,6 +63,7 @@ impl MprisServer {
         connect_player_action!(player, client, connect_next, next, NextRequest {});
         connect_player_action!(player, client, connect_play, resume, ResumeRequest {});
         connect_player_action!(player, client, connect_pause, pause, PauseRequest {});
+        connect_player_action!(player, client, connect_play_pause, play_or_pause, PlayOrPauseRequest {});
         connect_player_seek_action!(player, client);
         connect_player_set_position_action!(player, client);
         connect_player_action!(player, client, connect_stop, hard_stop, HardStopRequest {});
diff --git a/crates/rpc/proto/rockbox/v1alpha1/playback.proto b/crates/rpc/proto/rockbox/v1alpha1/playback.proto
@@ -11,6 +11,10 @@ message PlayResponse {}
 
 message PauseRequest {}
 
+message PlayOrPauseRequest {}
+
+message PlayOrPauseResponse {}
+
 message PauseResponse {}
 
 message ResumeRequest {}
@@ -174,6 +178,7 @@ message PlaylistResponse {
 service PlaybackService {
   rpc Play(PlayRequest) returns (PlayResponse) {}
   rpc Pause(PauseRequest) returns (PauseResponse) {}
+  rpc PlayOrPause(PlayOrPauseRequest) returns (PlayOrPauseResponse) {}
   rpc Resume(ResumeRequest) returns (ResumeResponse) {}
   rpc Next(NextRequest) returns (NextResponse) {}
   rpc Previous(PreviousRequest) returns (PreviousResponse) {}
diff --git a/crates/rpc/src/api/rockbox.v1alpha1.rs b/crates/rpc/src/api/rockbox.v1alpha1.rs
@@ -2654,6 +2654,10 @@ pub struct PlayResponse {}
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct PauseRequest {}
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
+pub struct PlayOrPauseRequest {}
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+pub struct PlayOrPauseResponse {}
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct PauseResponse {}
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct ResumeRequest {}
@@ -3015,6 +3019,32 @@ pub mod playback_service_client {
                 .insert(GrpcMethod::new("rockbox.v1alpha1.PlaybackService", "Pause"));
             self.inner.unary(req, path, codec).await
         }
+        pub async fn play_or_pause(
+            &mut self,
+            request: impl tonic::IntoRequest<super::PlayOrPauseRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::PlayOrPauseResponse>,
+            tonic::Status,
+        > {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/rockbox.v1alpha1.PlaybackService/PlayOrPause",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(
+                    GrpcMethod::new("rockbox.v1alpha1.PlaybackService", "PlayOrPause"),
+                );
+            self.inner.unary(req, path, codec).await
+        }
         pub async fn resume(
             &mut self,
             request: impl tonic::IntoRequest<super::ResumeRequest>,
@@ -3557,6 +3587,13 @@ pub mod playback_service_server {
             &self,
             request: tonic::Request<super::PauseRequest>,
         ) -> std::result::Result<tonic::Response<super::PauseResponse>, tonic::Status>;
+        async fn play_or_pause(
+            &self,
+            request: tonic::Request<super::PlayOrPauseRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::PlayOrPauseResponse>,
+            tonic::Status,
+        >;
         async fn resume(
             &self,
             request: tonic::Request<super::ResumeRequest>,
@@ -3871,6 +3908,51 @@ pub mod playback_service_server {
                     };
                     Box::pin(fut)
                 }
+                "/rockbox.v1alpha1.PlaybackService/PlayOrPause" => {
+                    #[allow(non_camel_case_types)]
+                    struct PlayOrPauseSvc<T: PlaybackService>(pub Arc<T>);
+                    impl<
+                        T: PlaybackService,
+                    > tonic::server::UnaryService<super::PlayOrPauseRequest>
+                    for PlayOrPauseSvc<T> {
+                        type Response = super::PlayOrPauseResponse;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::PlayOrPauseRequest>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as PlaybackService>::play_or_pause(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = PlayOrPauseSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
                 "/rockbox.v1alpha1.PlaybackService/Resume" => {
                     #[allow(non_camel_case_types)]
                     struct ResumeSvc<T: PlaybackService>(pub Arc<T>);
diff --git a/crates/rpc/src/api/rockbox_descriptor.bin b/crates/rpc/src/api/rockbox_descriptor.bin
diff --git a/crates/rpc/src/playback.rs b/crates/rpc/src/playback.rs
@@ -62,6 +62,40 @@ impl PlaybackService for Playback {
             .map_err(|e| tonic::Status::internal(e.to_string()))?;
         Ok(tonic::Response::new(PauseResponse::default()))
     }
+    
+    async fn play_or_pause(
+        &self,
+        _request: tonic::Request<PlayOrPauseRequest>,
+    ) -> Result<tonic::Response<PlayOrPauseResponse>, tonic::Status> {
+        let client = reqwest::Client::new();
+        let response = client
+            .get(&format!("{}/player/status", rockbox_url()))
+            .send()
+            .await
+            .map_err(|e| tonic::Status::internal(e.to_string()))?
+            .json::<AudioStatus>()
+            .await
+            .map_err(|e| tonic::Status::internal(e.to_string()))?;
+        
+        let client = reqwest::Client::new();
+        match response.status {
+            1 => {
+                client
+                    .put(&format!("{}/player/pause", rockbox_url()))
+                    .send()
+                    .await
+                    .map_err(|e| tonic::Status::internal(e.to_string()))?;
+                },
+            _ => {
+                client
+                    .put(&format!("{}/player/resume", rockbox_url()))
+                    .send()
+                    .await
+                    .map_err(|e| tonic::Status::internal(e.to_string()))?;
+            }
+        };
+        Ok(tonic::Response::new(PlayOrPauseResponse::default()))
+    }
 
     async fn resume(
         &self,
diff --git a/dist/debian/amd64/DEBIAN/control b/dist/debian/amd64/DEBIAN/control
@@ -1,8 +1,8 @@
 Package: rockbox
-Version: 2025.01.26
+Version: 2025.01.27
 Section: user/multimedia
 Priority: optional
 Architecture: amd64
 Maintainer: Tsiry Sandratraina <tsiry.sndr@fluentci.io>
-Depends: libusb-dev, libsdl2-dev, libfreetype6-dev, libunwind-dev, alsa-utils, libasound2-dev
+Depends: libsdl2-dev, libfreetype6-dev, libunwind-dev, alsa-utils, libasound2-dev
 Description: Rockbox open source high quality audio player
diff --git a/dist/debian/arm64/DEBIAN/control b/dist/debian/arm64/DEBIAN/control
@@ -1,8 +1,8 @@
 Package: rockbox
-Version: 2025.01.26
+Version: 2025.01.27
 Section: user/multimedia
 Priority: optional
 Architecture: arm64
 Maintainer: Tsiry Sandratraina <tsiry.sndr@fluentci.io>
-Depends: libusb-dev, libsdl2-dev, libfreetype6-dev, libunwind-dev, alsa-utils, libasound2-dev
+Depends: libsdl2-dev, libfreetype6-dev, libunwind-dev, alsa-utils, libasound2-dev
 Description: Rockbox open source high quality audio player
diff --git a/dist/rpm/amd64/rockbox.spec b/dist/rpm/amd64/rockbox.spec
@@ -1,5 +1,5 @@
 Name:           rockbox
-Version:        2025.01.26
+Version:        2025.01.27
 Release:        1%{?dist}
 Summary:        High quality audio player
 
diff --git a/dist/rpm/arm64/rockbox.spec b/dist/rpm/arm64/rockbox.spec
@@ -1,5 +1,5 @@
 Name:           rockbox
-Version:        2025.01.26
+Version:        2025.01.27
 Release:        1%{?dist}
 Summary:        High quality audio player
 
