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

Block player thread when nothing is playing.

Browse source
This commit is contained in:
Paul Lietar 2015-12-28 18:45:13 +01:00
parent 17d4534260
commit 22d586e473
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mercury.rs
View file

@ -1,5 +1,5 @@
use byteorder::{BigEndian, ByteOrder, ReadBytesExt, WriteBytesExt};
use eventual;
use eventual::{self, Async};
use protobuf::{self, Message};
use std::collections::HashMap;
use std::io::{Cursor, Read, Write};
@ -100,7 +100,7 @@ impl MercuryManager {
uri: uri,
content_type: None,
payload: Vec::new()
});
}).fire();
rx
}

20
src/player.rs
View file

@ -85,8 +85,14 @@ impl PlayerInternal {
let mut decoder = None;
loop {
match self.commands.try_recv() {
Ok(PlayerCommand::Load(track_id, play, position)) => {
let cmd = if self.state.0.lock().unwrap().status == PlayStatus::kPlayStatusPlay {
self.commands.try_recv().ok()
} else {
Some(self.commands.recv().unwrap())
};
match cmd {
Some(PlayerCommand::Load(track_id, play, position)) => {
self.update(|state| {
if state.status == PlayStatus::kPlayStatusPlay {
stream.stop().unwrap();
@ -133,7 +139,7 @@ impl PlayerInternal {
});
println!("Load Done");
}
Ok(PlayerCommand::Seek(ms)) => {
Some(PlayerCommand::Seek(ms)) => {
decoder.as_mut().unwrap().time_seek(ms as f64 / 1000f64).unwrap();
self.update(|state| {
state.position_ms = (decoder.as_mut().unwrap().time_tell().unwrap() * 1000f64) as u32;
@ -141,7 +147,7 @@ impl PlayerInternal {
return true;
});
},
Ok(PlayerCommand::Play) => {
Some(PlayerCommand::Play) => {
self.update(|state| {
state.status = PlayStatus::kPlayStatusPlay;
return true;
@ -149,7 +155,7 @@ impl PlayerInternal {
stream.start().unwrap();
},
Ok(PlayerCommand::Pause) => {
Some(PlayerCommand::Pause) => {
self.update(|state| {
state.status = PlayStatus::kPlayStatusPause;
state.update_time = util::now_ms();
@ -158,7 +164,7 @@ impl PlayerInternal {
stream.stop().unwrap();
},
Ok(PlayerCommand::Stop) => {
Some(PlayerCommand::Stop) => {
self.update(|state| {
if state.status == PlayStatus::kPlayStatusPlay {
state.status = PlayStatus::kPlayStatusPause;
@ -169,7 +175,7 @@ impl PlayerInternal {
stream.stop().unwrap();
decoder = None;
},
Err(..) => (),
None => (),
}
if self.state.0.lock().unwrap().status == PlayStatus::kPlayStatusPlay {