From c98a3580e66b89f0d8b514ae79a0cfaef809b927 Mon Sep 17 00:00:00 2001 From: Austin Schey Date: Thu, 4 Apr 2024 14:13:05 -0500 Subject: [PATCH] update stream-download --- Cargo.lock | 4 ++-- libplatune/player/Cargo.toml | 2 +- libplatune/player/src/lib.rs | 2 +- platuned/server/src/server.rs | 4 ++-- platuned/server/src/services/player.rs | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fa6a19b1..b83ebc16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6395,9 +6395,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stream-download" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48a09e7d644f208aebfc69668b4c780ab9e970e62f92e63bf81d2f8d59b6c5f0" +checksum = "85fa761723d640532a18f46b7f429fc181fc8d2b5b37721fad5cd48bd95098a5" dependencies = [ "bytes", "futures", diff --git a/libplatune/player/Cargo.toml b/libplatune/player/Cargo.toml index 63d4fbe0..6b09eb39 100644 --- a/libplatune/player/Cargo.toml +++ b/libplatune/player/Cargo.toml @@ -14,7 +14,7 @@ derivative = "2" eyre = "0.6" flume = "0.11" futures-util = "0.3" -stream-download = { version = "0.5.1", features = ["reqwest-rustls"] } +stream-download = { version = "0.5.2", features = ["reqwest-rustls"] } strum = { version = "0.26", features = ["derive"] } tap = "1" thiserror = "1" diff --git a/libplatune/player/src/lib.rs b/libplatune/player/src/lib.rs index 65f3eab5..6b2c9817 100644 --- a/libplatune/player/src/lib.rs +++ b/libplatune/player/src/lib.rs @@ -5,7 +5,7 @@ mod http_stream_reader; mod player; mod settings; mod two_way_channel; -pub use decal::output::{AudioBackend, CubebOutput, MockOutput}; +pub use decal::output::{AudioBackend, CpalOutput, MockOutput}; pub mod platune_player { use std::fs::remove_file; diff --git a/platuned/server/src/server.rs b/platuned/server/src/server.rs index 8c1a68cc..64d3d90e 100644 --- a/platuned/server/src/server.rs +++ b/platuned/server/src/server.rs @@ -22,7 +22,7 @@ use libplatune_management::manager::Manager; #[cfg(feature = "player")] use libplatune_player::platune_player::PlatunePlayer; #[cfg(feature = "player")] -use libplatune_player::CubebOutput; +use libplatune_player::CpalOutput; use platuned::MAIN_SERVER_PORT; use tonic::transport::Server; use tonic_reflection::server::Builder; @@ -49,7 +49,7 @@ enum Transport { #[derive(Clone)] struct Services { #[cfg(feature = "player")] - player: Arc>, + player: Arc>, #[cfg(feature = "management")] manager: FileWatchManager, } diff --git a/platuned/server/src/services/player.rs b/platuned/server/src/services/player.rs index 24a823bf..5fa113bf 100644 --- a/platuned/server/src/services/player.rs +++ b/platuned/server/src/services/player.rs @@ -5,7 +5,7 @@ use std::time::Duration; use daemon_slayer::server::{BroadcastEventStore, EventStore, Signal}; use futures::StreamExt; use libplatune_player::platune_player::*; -use libplatune_player::CubebOutput; +use libplatune_player::CpalOutput; use tokio::sync::broadcast::error::RecvError; use tonic::{Request, Response, Status}; use tracing::{error, info}; @@ -15,13 +15,13 @@ use crate::rpc::event_response::*; use crate::rpc::*; pub struct PlayerImpl { - player: Arc>, + player: Arc>, shutdown_rx: BroadcastEventStore, } impl PlayerImpl { pub fn new( - player: Arc>, + player: Arc>, shutdown_rx: BroadcastEventStore, ) -> Self { PlayerImpl {