diff --git a/assets/voxygen/audio/sfx/blank.wav b/assets/voxygen/audio/sfx/blank.wav deleted file mode 100644 index 33a78d1e76..0000000000 --- a/assets/voxygen/audio/sfx/blank.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f00dc96abc1ca9515871ff5623a9e6982c0143b91ac049224bf2878b1db0c81 -size 176444 diff --git a/assets/voxygen/audio/sfx/chat_tell_received.wav b/assets/voxygen/audio/sfx/chat_tell_received.wav deleted file mode 100644 index 682c32b65c..0000000000 --- a/assets/voxygen/audio/sfx/chat_tell_received.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa1d16d502e893a2d77af075458d12a51c96cda9eb58ee15c5a7c0b9e4ce42dc -size 110216 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav deleted file mode 100644 index e360df4160..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bfe007cb35d2b9d9061d34426ccfa7be3056222c6df622b24582ffde4817ae15 -size 93240 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav deleted file mode 100644 index ddc63ec159..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea9b3938b3cb426e25e49abe1da69d5ae6ce7d999cb810896b973a8d49b6b63e -size 93240 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav deleted file mode 100644 index 62476df5e5..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de270fc772feccbb49dcb97dda52e18a1f4e3737cb38c83f8b869a9ea914a54b -size 115844 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav deleted file mode 100644 index df05003543..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:964dd63f839409e6cfba7b4aa05c4e9b58ee4627ada9b05c9da8cd28a7dce4bd -size 132380 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav deleted file mode 100644 index 9cc53901ae..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23407d194ec496d3680c4cb10376a75a06b90269415cbbaedc89693568363013 -size 132380 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_6.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_6.wav deleted file mode 100644 index a0a9747e36..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepdirt_6.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90430f0914229ec047cd789108c97351d716ffbc98a04e802b90a52c84865606 -size 132380 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_7.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_7.wav deleted file mode 100644 index 2e881f8973..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepdirt_7.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46e37ad77e838d3f7c7614bf77dc5472fd29e7e363bce59f7bf83d4a5ca5e19c -size 132380 diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_8.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_8.wav deleted file mode 100644 index 0413331170..0000000000 --- a/assets/voxygen/audio/sfx/footsteps/stepdirt_8.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5dea4eca0889f7435f062f13465327e7b6bc6d73336d676ca0e64a6d1ee8c246 -size 132380 diff --git a/assets/voxygen/audio/sfx/inventory_add.wav b/assets/voxygen/audio/sfx/inventory_add.wav deleted file mode 100644 index 3f2dbd12f9..0000000000 --- a/assets/voxygen/audio/sfx/inventory_add.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:609e8c76ca79070f8617859b032db03d62b27e7c2a929dd075a81d966d65dd09 -size 91544 diff --git a/assets/voxygen/audio/sfx/weapon/bow.wav b/assets/voxygen/audio/sfx/weapon/bow.wav deleted file mode 100644 index c1a95e53a8..0000000000 --- a/assets/voxygen/audio/sfx/weapon/bow.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04a6d2eccb0ff5d440e6d819c09d5eeee789cfec859256cbb0439575031a95fc -size 25344 diff --git a/assets/voxygen/audio/sfx/weapon/sword.wav b/assets/voxygen/audio/sfx/weapon/sword.wav deleted file mode 100644 index c319ce4f22..0000000000 --- a/assets/voxygen/audio/sfx/weapon/sword.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f00482df6596cafa1f66fc37ff52818a7e5f46f8af2e214cdf6571c2f6b72f47 -size 56116 diff --git a/assets/voxygen/audio/soundtrack/Ethereal_Bonds.ogg b/assets/voxygen/audio/soundtrack/Ethereal_Bonds.ogg deleted file mode 100644 index fa53b42f72..0000000000 --- a/assets/voxygen/audio/soundtrack/Ethereal_Bonds.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:295cac684268e297ea4d534aea5aa1b1cb852001ee1b2fed10c1ee63bac3be83 -size 2560641 diff --git a/assets/voxygen/audio/soundtrack/Mineral_Deposits.ogg b/assets/voxygen/audio/soundtrack/Mineral_Deposits.ogg deleted file mode 100644 index 42c1da0905..0000000000 --- a/assets/voxygen/audio/soundtrack/Mineral_Deposits.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2261a1229682f1aecc9776eb8eee46c774bdff75a2a2a2e897bfa09c4217532 -size 8395603 diff --git a/assets/voxygen/audio/soundtrack/Ruination.ogg b/assets/voxygen/audio/soundtrack/Ruination.ogg deleted file mode 100644 index 516cba9cf9..0000000000 --- a/assets/voxygen/audio/soundtrack/Ruination.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc36bd7de61a370ab8d003142dbc57d188cc98b55f08cb71cdb784ff635cb195 -size 7631089 diff --git a/assets/voxygen/audio/soundtrack/Snowtop_volume.ogg b/assets/voxygen/audio/soundtrack/Snowtop_volume.ogg deleted file mode 100644 index 46e5fe08ac..0000000000 --- a/assets/voxygen/audio/soundtrack/Snowtop_volume.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b581be43adaea478f2949811e2b0dc9852f0c311dd6f7423c201c6c025c144e4 -size 5039853 diff --git a/assets/voxygen/audio/soundtrack/field_grazing.ogg b/assets/voxygen/audio/soundtrack/field_grazing.ogg deleted file mode 100644 index b3b1115318..0000000000 --- a/assets/voxygen/audio/soundtrack/field_grazing.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31abe12210d7eaea3fbdd9e52102f63711b8227c31985dac9cf2da319e24fed0 -size 8645063 diff --git a/assets/voxygen/audio/soundtrack/fiesta_del_pueblo.ogg b/assets/voxygen/audio/soundtrack/fiesta_del_pueblo.ogg deleted file mode 100644 index 11da92a168..0000000000 --- a/assets/voxygen/audio/soundtrack/fiesta_del_pueblo.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f11476de97adf237b063041fa3a85d5e32997c5465511acd92d1069ac9ae1617 -size 11193495 diff --git a/assets/voxygen/audio/soundtrack/library_theme_with_harpsichord.ogg b/assets/voxygen/audio/soundtrack/library_theme_with_harpsichord.ogg deleted file mode 100644 index 3ea6a24535..0000000000 --- a/assets/voxygen/audio/soundtrack/library_theme_with_harpsichord.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5bd20e01b74c51319dcb502b81f41345651990096db5f120064044dd320f21dd -size 3639871 diff --git a/assets/voxygen/audio/soundtrack/regional/grasslands.ogg b/assets/voxygen/audio/soundtrack/regional/grasslands.ogg deleted file mode 100644 index b030463a6f..0000000000 --- a/assets/voxygen/audio/soundtrack/regional/grasslands.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c37d637e6dfc0dd539b1bff49c256dd0120140e8f48091bf2591c095ecae37b -size 5458642 diff --git a/assets/voxygen/audio/soundtrack/sacred_temple.ogg b/assets/voxygen/audio/soundtrack/sacred_temple.ogg deleted file mode 100644 index 983e6818ec..0000000000 --- a/assets/voxygen/audio/soundtrack/sacred_temple.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdd47e13e39a46d2c3ae40481707937f99e04aab4c24ecc31cee6e828446eb68 -size 4288785 diff --git a/voxygen/src/audio/mod.rs b/voxygen/src/audio/mod.rs index 2f37783e11..f6fb961e68 100644 --- a/voxygen/src/audio/mod.rs +++ b/voxygen/src/audio/mod.rs @@ -209,12 +209,6 @@ impl AudioFrontend { } } -pub fn select_random_music() -> String { - let soundtracks = load_soundtracks(); - let index = rand::random::() % 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 { - 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::>(); - - 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 {