Merge branch 'shandley/audio-assets-cleanup' into 'master'

Remove currently unused audio assets

See merge request veloren/veloren!710
This commit is contained in:
Songtronix 2020-01-20 15:07:30 +00:00
commit da6b209753
23 changed files with 0 additions and 87 deletions

BIN
assets/voxygen/audio/sfx/blank.wav (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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)

Binary file not shown.

BIN
assets/voxygen/audio/sfx/weapon/sword.wav (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -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> {