github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Join the player thread when the player is dropped

Browse source
This commit is contained in:
Thomas Bächler 2017-11-28 00:35:04 +01:00
parent f5d8019c18
commit f250179fed
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/player.rs
View file

@ -16,9 +16,9 @@ use audio::{VorbisDecoder, VorbisPacket};
use metadata::{FileFormat, Track, Metadata};
use mixer::AudioFilter;
#[derive(Clone)]
pub struct Player {
commands: std::sync::mpsc::Sender<PlayerCommand>,
commands: Option<std::sync::mpsc::Sender<PlayerCommand>>,
thread_handle: Option<thread::JoinHandle<()>>,
}
struct PlayerInternal {
@ -47,7 +47,7 @@ impl Player {
{
let (cmd_tx, cmd_rx) = std::sync::mpsc::channel();
thread::spawn(move || {
let handle = thread::spawn(move || {
debug!("new Player[{}]", session.session_id());
let internal = PlayerInternal {
@ -64,12 +64,13 @@ impl Player {
});
Player {
commands: cmd_tx,
commands: Some(cmd_tx),
thread_handle: Some(handle),
}
}
fn command(&self, cmd: PlayerCommand) {
self.commands.send(cmd).unwrap();
self.commands.as_ref().unwrap().send(cmd).unwrap();
}
pub fn load(&self, track: SpotifyId, start_playing: bool, position_ms: u32)
@ -98,6 +99,19 @@ impl Player {
}
}
impl Drop for Player {
fn drop(&mut self) {
debug!("Shutting down player thread ...");
self.commands = None;
if let Some(handle) = self.thread_handle.take() {
match handle.join() {
Ok(_) => (),
Err(_) => error!("Player thread panicked!")
}
}
}
}
type Decoder = VorbisDecoder<Subfile<AudioDecrypt<AudioFile>>>;
enum PlayerState {
Stopped,