Skip to content

Commit

Permalink
update stream-download
Browse files Browse the repository at this point in the history
  • Loading branch information
aschey committed Apr 4, 2024
1 parent 227e9fd commit c98a358
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion libplatune/player/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion libplatune/player/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions platuned/server/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -49,7 +49,7 @@ enum Transport {
#[derive(Clone)]
struct Services {
#[cfg(feature = "player")]
player: Arc<PlatunePlayer<CubebOutput>>,
player: Arc<PlatunePlayer<CpalOutput>>,
#[cfg(feature = "management")]
manager: FileWatchManager,
}
Expand Down
6 changes: 3 additions & 3 deletions platuned/server/src/services/player.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand All @@ -15,13 +15,13 @@ use crate::rpc::event_response::*;
use crate::rpc::*;

pub struct PlayerImpl {
player: Arc<PlatunePlayer<CubebOutput>>,
player: Arc<PlatunePlayer<CpalOutput>>,
shutdown_rx: BroadcastEventStore<Signal>,
}

impl PlayerImpl {
pub fn new(
player: Arc<PlatunePlayer<CubebOutput>>,
player: Arc<PlatunePlayer<CpalOutput>>,
shutdown_rx: BroadcastEventStore<Signal>,
) -> Self {
PlayerImpl {
Expand Down

0 comments on commit c98a358

Please sign in to comment.