use cubeb backend

Author: aschey

Cargo.lock

@@ -20,7 +20,7 @@ tap = "1"
 thiserror = "1"
 tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
 tracing = "0.1"
-decal = { git = "https://github.com/aschey/decal", rev = "44d9826ab22ffd2fcb804bf188ff5747c06a607e" }
+decal = { git = "https://github.com/aschey/decal", rev = "0c2313a0f70d6fa78568ebac0146df6c0e95b450" }
 
 [dev-dependencies]
 assert_matches = "1.5.0"

libplatune/player/Cargo.toml

@@ -1,11 +1,12 @@
 #![no_main]
-use libfuzzer_sys::{arbitrary::Arbitrary, fuzz_target};
-use libplatune_player::{
-    platune_player::{PlatunePlayer, Settings},
-    CpalOutput,
-};
+use std::env::current_dir;
+use std::time::Duration;
+
+use libfuzzer_sys::arbitrary::Arbitrary;
+use libfuzzer_sys::fuzz_target;
+use libplatune_player::platune_player::{PlatunePlayer, Settings};
+use libplatune_player::CpalOutput;
 use once_cell::sync::Lazy;
-use std::{env::current_dir, time::Duration};
 use tokio::runtime::Runtime;
 
 #[derive(Arbitrary, Debug)]

libplatune/player/fuzz/fuzz_targets/player.rs

@@ -5,14 +5,14 @@ mod http_stream_reader;
 mod player;
 mod settings;
 mod two_way_channel;
-pub use decal::output::{AudioBackend, CpalOutput, MockOutput};
+pub use decal::output::{AudioBackend, CubebOutput, MockOutput};
 
 pub mod platune_player {
     use std::fs::remove_file;
     use std::thread;
     use std::time::Duration;
 
-    use decal::output::{AudioBackend, DeviceTrait, HostTrait};
+    use decal::output::{AudioBackend, Device, Host};
     use derivative::Derivative;
     use tap::TapFallible;
     use thiserror::Error;

libplatune/player/src/lib.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::CpalOutput;
+use libplatune_player::CubebOutput;
 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<PlatunePlayer<CpalOutput>>,
+    player: Arc<PlatunePlayer<CubebOutput>>,
     #[cfg(feature = "management")]
     manager: FileWatchManager,
 }

platuned/server/src/server.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::CpalOutput;
+use libplatune_player::CubebOutput;
 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<PlatunePlayer<CpalOutput>>,
+    player: Arc<PlatunePlayer<CubebOutput>>,
     shutdown_rx: BroadcastEventStore<Signal>,
 }
 
 impl PlayerImpl {
     pub fn new(
-        player: Arc<PlatunePlayer<CpalOutput>>,
+        player: Arc<PlatunePlayer<CubebOutput>>,
         shutdown_rx: BroadcastEventStore<Signal>,
     ) -> Self {
         PlayerImpl {