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

Revamped asset loading system

Browse Source
This commit is contained in:
Joshua Barretto 2019-07-02 13:42:39 +01:00
parent a72c54011a
commit 6dae0c8cd2
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,7 +425,6 @@ 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() {
@ -434,5 +433,3 @@ fn test_load_soundtracks() {
println!("{}", entry)
}
}
=======
>>>>>>> Revamping the audio system for Voxygen from #163