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

Revamping the audio system for Voxygen from #163

Browse Source
This commit is contained in:
Sheldon Knuth 2019-07-02 04:10:55 +00:00 committed by Joshua Barretto
parent de9d05999d
commit 0ec240ea8e
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,6 +425,7 @@ fn send_msg(tx: &mut Sender<AudioPlayerMsg>, msg: AudioPlayerMsg) {
fn list_devices_raw() -> Vec<Device> {
rodio::output_devices().collect()
}
<<<<<<< HEAD
#[test]
fn test_load_soundtracks() {
@ -433,3 +434,5 @@ fn test_load_soundtracks() {
println!("{}", entry)
}
}
=======
>>>>>>> Revamping the audio system for Voxygen from #163