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

Don’t crash on end of track.

Browse source
This commit is contained in:
Paul Lietar 2015-07-09 22:32:40 +01:00
parent 94503e351b
commit 506f3e624e
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/player.rs
View file

@ -160,8 +160,8 @@ impl <'s> PlayerInternal<'s> {
} }
if self.state.0.lock().unwrap().status == PlayStatus::kPlayStatusPlay { if self.state.0.lock().unwrap().status == PlayStatus::kPlayStatusPlay {
match decoder.as_mut().unwrap().packets().next().unwrap() { match decoder.as_mut().unwrap().packets().next() {
Ok(packet) => { Some(Ok(packet)) => {
match stream.write(&packet.data) { match stream.write(&packet.data) {
Ok(_) => (), Ok(_) => (),
Err(portaudio::PaError::OutputUnderflowed) Err(portaudio::PaError::OutputUnderflowed)
@ -169,8 +169,17 @@ impl <'s> PlayerInternal<'s> {
Err(e) => panic!("PA Error {}", e) Err(e) => panic!("PA Error {}", e)
}; };
}, },
Err(vorbis::VorbisError::Hole) => (), Some(Err(vorbis::VorbisError::Hole)) => (),
Err(e) => panic!("Vorbis error {:?}", e) Some(Err(e)) => panic!("Vorbis error {:?}", e),
None => {
self.update(|state| {
state.status = PlayStatus::kPlayStatusStop;
return true;
});
stream.stop().unwrap();
decoder = None;
}
} }
self.update(|state| { self.update(|state| {
@ -199,7 +208,6 @@ impl <'s> PlayerInternal<'s> {
if update { if update {
guard.update_time = util::now_ms(); guard.update_time = util::now_ms();
self.state.1.notify_all(); self.state.1.notify_all();
} }
} }
} }