Skip to content

Commit

Permalink
Remove wasm audio feature flag for 2021 (#3000)
Browse files Browse the repository at this point in the history
- Requires #2997 
- Removes `wasm_audio` feature as discussed in #2397
- Closes only task in #2479 

Open questions:
Should we enable wasm audio by default or only when building for wasm using `cfg`?
Maybe there should be a global wasm feature for bevy?
  • Loading branch information
Ixentus committed Nov 11, 2021
1 parent 12e0b80 commit 36394ad
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 8 deletions.
3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ mp3 = ["bevy_internal/mp3"]
vorbis = ["bevy_internal/vorbis"]
wav = ["bevy_internal/wav"]

# WASM support for audio (Currently only works with flac, wav and vorbis. Not with mp3)
wasm_audio = ["bevy_internal/wasm_audio"]

serialize = ["bevy_internal/serialize"]

# Display server protocol support (X11 is enabled by default)
Expand Down
4 changes: 3 additions & 1 deletion crates/bevy_audio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ anyhow = "1.0.4"
rodio = { version = "0.14", default-features = false }
parking_lot = "0.11.0"

[target.'cfg(target_arch = "wasm32")'.dependencies]
rodio = { version = "0.14", default-features = false, features = ["wasm-bindgen"] }

[features]
mp3 = ["rodio/mp3"]
flac = ["rodio/flac"]
wav = ["rodio/wav"]
vorbis = ["rodio/vorbis"]
wasm_audio = ["rodio/wasm-bindgen"]
3 changes: 0 additions & 3 deletions crates/bevy_internal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ mp3 = ["bevy_audio/mp3"]
vorbis = ["bevy_audio/vorbis"]
wav = ["bevy_audio/wav"]

# WASM support for audio
wasm_audio = ["bevy_audio/wasm_audio"]

serialize = ["bevy_input/serialize"]

# Display server protocol support (X11 is enabled by default)
Expand Down
1 change: 0 additions & 1 deletion docs/cargo_features.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
|flac|FLAC audio format support. It's included in bevy_audio feature.|
|wav|WAV audio format support.|
|vorbis|Vorbis audio format support.|
|wasm_audio|WASM audio support. (Currently only works with flac, wav and vorbis. Not with mp3)|
|serialize|Enables serialization of `bevy_input` types.|
|wayland|Enable this to use Wayland display server protocol other than X11.|
|subpixel_glyph_atlas|Enable this to cache glyphs using subpixel accuracy. This increases texture memory usage as each position requires a separate sprite in the glyph atlas, but provide more accurate character spacing.|
Expand Down

0 comments on commit 36394ad

Please sign in to comment.