mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'shandley/audio-assets-cleanup' into 'master'
Remove currently unused audio assets See merge request veloren/veloren!710
This commit is contained in:
commit
da6b209753
BIN
assets/voxygen/audio/sfx/blank.wav
(Stored with Git LFS)
BIN
assets/voxygen/audio/sfx/blank.wav
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/sfx/chat_tell_received.wav
(Stored with Git LFS)
BIN
assets/voxygen/audio/sfx/chat_tell_received.wav
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav
(Stored with Git LFS)
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav
(Stored with Git LFS)
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav
(Stored with Git LFS)
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav
(Stored with Git LFS)
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav
(Stored with Git LFS)
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_6.wav
(Stored with Git LFS)
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_6.wav
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_7.wav
(Stored with Git LFS)
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_7.wav
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_8.wav
(Stored with Git LFS)
BIN
assets/voxygen/audio/sfx/footsteps/stepdirt_8.wav
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/sfx/inventory_add.wav
(Stored with Git LFS)
BIN
assets/voxygen/audio/sfx/inventory_add.wav
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/sfx/weapon/bow.wav
(Stored with Git LFS)
BIN
assets/voxygen/audio/sfx/weapon/bow.wav
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/sfx/weapon/sword.wav
(Stored with Git LFS)
BIN
assets/voxygen/audio/sfx/weapon/sword.wav
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/soundtrack/Ethereal_Bonds.ogg
(Stored with Git LFS)
BIN
assets/voxygen/audio/soundtrack/Ethereal_Bonds.ogg
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/soundtrack/Mineral_Deposits.ogg
(Stored with Git LFS)
BIN
assets/voxygen/audio/soundtrack/Mineral_Deposits.ogg
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/soundtrack/Ruination.ogg
(Stored with Git LFS)
BIN
assets/voxygen/audio/soundtrack/Ruination.ogg
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/soundtrack/Snowtop_volume.ogg
(Stored with Git LFS)
BIN
assets/voxygen/audio/soundtrack/Snowtop_volume.ogg
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/soundtrack/field_grazing.ogg
(Stored with Git LFS)
BIN
assets/voxygen/audio/soundtrack/field_grazing.ogg
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/soundtrack/fiesta_del_pueblo.ogg
(Stored with Git LFS)
BIN
assets/voxygen/audio/soundtrack/fiesta_del_pueblo.ogg
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/soundtrack/library_theme_with_harpsichord.ogg
(Stored with Git LFS)
BIN
assets/voxygen/audio/soundtrack/library_theme_with_harpsichord.ogg
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/soundtrack/regional/grasslands.ogg
(Stored with Git LFS)
BIN
assets/voxygen/audio/soundtrack/regional/grasslands.ogg
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/audio/soundtrack/sacred_temple.ogg
(Stored with Git LFS)
BIN
assets/voxygen/audio/soundtrack/sacred_temple.ogg
(Stored with Git LFS)
Binary file not shown.
@ -209,12 +209,6 @@ impl AudioFrontend {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn select_random_music() -> String {
|
||||
let soundtracks = load_soundtracks();
|
||||
let index = rand::random::<usize>() % soundtracks.len();
|
||||
soundtracks[index].clone()
|
||||
}
|
||||
|
||||
/// Returns the default audio device.
|
||||
/// Does not return rodio Device struct in case our audio backend changes.
|
||||
pub fn get_default_device() -> String {
|
||||
@ -224,21 +218,6 @@ pub fn get_default_device() -> String {
|
||||
.expect("Unable to get device name")
|
||||
}
|
||||
|
||||
/// Load the audio file directory selected by genre.
|
||||
pub fn load_soundtracks() -> Vec<String> {
|
||||
let assets = assets::read_dir("voxygen.audio.soundtrack.regional").unwrap();
|
||||
let soundtracks = assets
|
||||
.filter_map(|entry| {
|
||||
entry.ok().map(|f| {
|
||||
let path = f.path();
|
||||
path.to_string_lossy().into_owned()
|
||||
})
|
||||
})
|
||||
.collect::<Vec<String>>();
|
||||
|
||||
soundtracks
|
||||
}
|
||||
|
||||
/// Returns a vec of the audio devices available.
|
||||
/// Does not return rodio Device struct in case our audio backend changes.
|
||||
pub fn list_devices() -> Vec<String> {
|
||||
|
Loading…
Reference in New Issue
Block a user