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

Added catching audio panics

Browse Source 
You can still make it panic by poisoning some variable if you try to change the audio device in settings after launch`
This commit is contained in:
Mckol 2019-06-28 19:05:20 +02:00
parent fd512597c4
commit f1b1c41d92
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
voxygen/src/audio/mod.rs
View File

@ -2,13 +2,14 @@ use crate::settings::AudioSettings;
use common::assets;
use rodio::{Decoder, Device, SpatialSink};
use std::iter::Iterator;
use std::panic::catch_unwind;
pub struct AudioFrontend {
device: Device,
// Performance optimisation, iterating through available audio devices takes time
devices: Vec<Device>,
// streams: HashMap<String, SpatialSink>, //always use SpatialSink even if no position is used for now
stream: SpatialSink,
stream: Option<SpatialSink>,
}
impl AudioFrontend {
@ -21,9 +22,17 @@ impl AudioFrontend {
None => rodio::default_output_device().expect("No audio devices found"),
};
let sink =
rodio::SpatialSink::new(&device, [0.0, 0.0, 0.0], [1.0, 0.0, 0.0], [-1.0, 0.0, 0.0]);
sink.set_volume(settings.music_volume);
let sink = catch_unwind(|| {
let sink = rodio::SpatialSink::new(
&device,
[0.0, 0.0, 0.0],
[1.0, 0.0, 0.0],
[-1.0, 0.0, 0.0],
);
sink.set_volume(settings.music_volume);
Some(sink)
})
.unwrap_or(None);
AudioFrontend {
device,
@ -40,7 +49,9 @@ impl AudioFrontend {
// TODO: stop previous audio from playing. Sink has this ability, but
// SpatialSink does not for some reason. This means that we will
// probably want to use sinks for music, and SpatialSink for sfx.
self.stream.append(src);
if let Some(s) = &self.stream {
s.append(src);
}
}
pub fn maintain(&mut self) {
@ -55,14 +66,19 @@ impl AudioFrontend {
"voxygen/audio/soundtrack/Snowtop_volume.ogg",
"voxygen/audio/soundtrack/veloren_title_tune-3.ogg",
];
if self.stream.empty() {
let i = rand::random::<usize>() % music.len();
self.play_music(music[i])
if let Some(s) = &self.stream {
if s.empty() {
let i = rand::random::<usize>() % music.len();
self.play_music(music[i]);
}
}
}
pub fn set_volume(&mut self, volume: f32) {
self.stream.set_volume(volume.min(1.0).max(0.0))
if let Some(s) = &self.stream {
s.set_volume(volume.min(1.0).max(0.0));
}
}
/// Returns a vec of the audio devices available.
@ -101,12 +117,16 @@ impl AudioFrontend {
pub fn set_device(&mut self, name: String) {
if let Some(dev) = rodio::output_devices().find(|x| x.name() == name) {
self.device = dev;
self.stream = rodio::SpatialSink::new(
&self.device,
[0.0, 0.0, 0.0],
[1.0, 0.0, 0.0],
[-1.0, 0.0, 0.0],
);
self.stream = catch_unwind(|| {
let sink = rodio::SpatialSink::new(
&self.device,
[0.0, 0.0, 0.0],
[1.0, 0.0, 0.0],
[-1.0, 0.0, 0.0],
);
Some(sink)
})
.unwrap_or(None);
}
}
}