github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-11-08 16:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use single player and mixer instances

Browse source
This commit is contained in:
Jarkko Lehtoranta 2023-06-13 17:56:40 +03:00
parent c6b62b82d4
commit e3db0994bc
No known key found for this signature in database
GPG key ID: E539048C587D1F09
6 changed files with 48 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
connect/src/spirc.rs
View file

@ -3,6 +3,7 @@ use std::{
future::Future,
pin::Pin,
sync::atomic::{AtomicUsize, Ordering},
sync::Arc,
time::{SystemTime, UNIX_EPOCH},
};
@ -77,8 +78,8 @@ enum SpircPlayStatus {
type BoxedStream<T> = Pin<Box<dyn FusedStream<Item = T> + Send>>;
struct SpircTask {
player: Player,
mixer: Box<dyn Mixer>,
player: Arc<Player>,
mixer: Arc<dyn Mixer>,
sequence: SeqGenerator<u32>,
@ -272,8 +273,8 @@ impl Spirc {
config: ConnectConfig,
session: Session,
credentials: Credentials,
player: Player,
mixer: Box<dyn Mixer>,
player: Arc<Player>,
mixer: Arc<dyn Mixer>,
) -> Result<(Spirc, impl Future<Output = ()>), Error> {
let spirc_id = SPIRC_COUNTER.fetch_add(1, Ordering::AcqRel);
debug!("new Spirc[{}]", spirc_id);

2
examples/play.rs
View file

@ -40,7 +40,7 @@ async fn main() {
exit(1);
}
let mut player = Player::new(player_config, session, Box::new(NoOpVolume), move || {
let player = Player::new(player_config, session, Box::new(NoOpVolume), move || {
backend(None, audio_format)
});

3
examples/play_connect.rs
View file

@ -17,6 +17,7 @@ use librespot_metadata::{Album, Metadata};
use librespot_playback::mixer::{softmixer::SoftMixer, Mixer, MixerConfig};
use librespot_protocol::spirc::TrackRef;
use std::env;
use std::sync::Arc;
use tokio::join;
#[tokio::main]
@ -54,7 +55,7 @@ async fn main() {
session.clone(),
credentials,
player,
Box::new(SoftMixer::open(MixerConfig::default())),
Arc::new(SoftMixer::open(MixerConfig::default())),
)
.await
.unwrap();

10
playback/src/mixer/mod.rs
View file

@ -1,3 +1,5 @@
use std::sync::Arc;
use crate::config::VolumeCtrl;
pub mod mappings;
@ -5,7 +7,7 @@ use self::mappings::MappedCtrl;
pub struct NoOpVolume;
pub trait Mixer: Send {
pub trait Mixer: Send + Sync {
fn open(config: MixerConfig) -> Self
where
Self: Sized;
@ -55,10 +57,10 @@ impl Default for MixerConfig {
}
}
pub type MixerFn = fn(MixerConfig) -> Box<dyn Mixer>;
pub type MixerFn = fn(MixerConfig) -> Arc<dyn Mixer>;
fn mk_sink<M: Mixer + 'static>(config: MixerConfig) -> Box<dyn Mixer> {
Box::new(M::open(config))
fn mk_sink<M: Mixer + 'static>(config: MixerConfig) -> Arc<dyn Mixer> {
Arc::new(M::open(config))
}
pub const MIXERS: &[(&str, MixerFn)] = &[

10
playback/src/player.rs
View file

@ -420,7 +420,7 @@ impl Player {
session: Session,
volume_getter: Box<dyn VolumeGetter + Send>,
sink_builder: F,
) -> Self
) -> Arc<Self>
where
F: FnOnce() -> Box<dyn Sink> + Send + 'static,
{
@ -490,10 +490,10 @@ impl Player {
debug!("PlayerInternal thread finished.");
});
Self {
Arc::new(Self {
commands: Some(cmd_tx),
thread_handle: Some(handle),
}
})
}
pub fn is_invalid(&self) -> bool {
@ -1390,10 +1390,6 @@ impl Future for PlayerInternal {
}
}
if self.session.is_invalid() {
return Poll::Ready(());
}
if (!self.state.is_playing()) && all_futures_completed_or_not_ready {
return Poll::Pending;
}

53
src/main.rs
View file

@ -1715,6 +1715,31 @@ async fn main() {
exit(1);
}
let mixer_config = setup.mixer_config.clone();
let mixer = (setup.mixer)(mixer_config);
let player_config = setup.player_config.clone();
let soft_volume = mixer.get_soft_volume();
let format = setup.format;
let backend = setup.backend;
let device = setup.device.clone();
let player = Player::new(player_config, session.clone(), soft_volume, move || {
(backend)(device, format)
});
if let Some(player_event_program) = setup.player_event_program.clone() {
_event_handler = Some(EventHandler::new(
player.get_player_event_channel(),
&player_event_program,
));
if setup.emit_sink_events {
player.set_sink_event_callback(Some(Box::new(move |sink_status| {
run_program_on_sink_events(sink_status, &player_event_program)
})));
}
}
loop {
tokio::select! {
credentials = async {
@ -1749,32 +1774,16 @@ async fn main() {
_ = async {}, if connecting && last_credentials.is_some() => {
if session.is_invalid() {
session = Session::new(setup.session_config.clone(), setup.cache.clone());
player.set_session(session.clone());
}
let mixer_config = setup.mixer_config.clone();
let mixer = (setup.mixer)(mixer_config);
let player_config = setup.player_config.clone();
let connect_config = setup.connect_config.clone();
let soft_volume = mixer.get_soft_volume();
let format = setup.format;
let backend = setup.backend;
let device = setup.device.clone();
let player = Player::new(player_config, session.clone(), soft_volume, move || {
(backend)(device, format)
});
if let Some(player_event_program) = setup.player_event_program.clone() {
_event_handler = Some(EventHandler::new(player.get_player_event_channel(), &player_event_program));
if setup.emit_sink_events {
player.set_sink_event_callback(Some(Box::new(move |sink_status| {
run_program_on_sink_events(sink_status, &player_event_program)
})));
}
};
let (spirc_, spirc_task_) = match Spirc::new(connect_config, session.clone(), last_credentials.clone().unwrap_or_default(), player, mixer).await {
let (spirc_, spirc_task_) = match Spirc::new(connect_config,
session.clone(),
last_credentials.clone().unwrap_or_default(),
player.clone(),
mixer.clone()).await {
Ok((spirc_, spirc_task_)) => (spirc_, spirc_task_),
Err(e) => {
error!("could not initialize spirc: {}", e);