Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix audio thread by removing PopError but use customised block function instead.

Browse Source
This commit is contained in:
Sheldon Knuth 2019-07-01 22:10:13 +08:00
parent d75d632279
commit 7f7d35fe7f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
voxygen/src/audio/base.rs
View File

@ -3,7 +3,7 @@ use common::assets::{load_from_path, read_from_assets};
use crossbeam::{
atomic::AtomicCell,
channel::{unbounded, Receiver, Sender},
queue::{PopError, SegQueue},
queue::SegQueue,
sync::{ShardedLock, WaitGroup},
};
use rodio::{Decoder, Device, Sink, SpatialSink};
@ -155,19 +155,20 @@ impl MonoMode for AudioPlayer {
};
let mut playback = MonoEmitter::new(&Settings::load().audio);
loop {
if let action = event_loop.queue.pop() {
if let Ok(action) = event_loop.queue.pop() {
match action {
Ok(Action::Load(path)) => {
Action::Load(path) => {
if playback.stream.empty() {
playback.play_from(&path);
send_msg(&mut tx, AudioPlayerMsg::AudioPlay);
}
}
Ok(Action::Stop) => playback.stream.stop(),
Ok(Action::AdjustVolume(value)) => playback.set_volume(value),
Ok(Action::ChangeDevice(device)) => playback.set_device(device),
Err(PopError) => eprintln!("There's no soundtrack in the playlist!"),
Action::Stop => playback.stream.stop(),
Action::AdjustVolume(value) => playback.set_volume(value),
Action::ChangeDevice(device) => playback.set_device(device),
}
} else {
block();
}
}
});
@ -212,7 +213,7 @@ impl Jukebox {
/// Display the current genre.
pub(crate) fn get_genre(self) -> Genre {
self.genre.into_inner()
self.genre.load()
}
}