Removes minimp3 usage and fixes fallback features

Author: mnmaita

Cargo.toml

@@ -489,16 +489,13 @@ zstd_rust = ["bevy_internal/zstd_rust"]
 zstd_c = ["bevy_internal/zstd_c"]
 
 # FLAC audio format support (through `claxon`)
-fallback-flac = ["bevy_internal/flac"]
+fallback-flac = ["bevy_internal/fallback-flac"]
 
-# MP3 audio format support (through `minimp3`)
-fallback-mp3 = ["bevy_internal/mp3"]
-
-# OGG/VORBIS audio format support (through `lewton`)
-fallback-vorbis = ["bevy_internal/vorbis"]
+# OGG/VORBIS audio format support (through `symphonia`)
+fallback-vorbis = ["bevy_internal/fallback-vorbis"]
 
 # WAV audio format support (through `hound`)
-fallback-wav = ["bevy_internal/wav"]
+fallback-wav = ["bevy_internal/fallback-wav"]
 
 # AAC audio format support (through `symphonia`)
 aac = ["bevy_internal/aac"]
@@ -515,7 +512,7 @@ mp4 = ["bevy_internal/mp4"]
 # MP3 audio format support (through `symphonia`)
 mp3 = ["bevy_internal/mp3"]
 
-# OGG/VORBIS audio format support (through `symphonia`)
+# OGG/VORBIS audio format support (through `lewton`)
 vorbis = ["bevy_internal/vorbis"]
 
 # WAV audio format support (through `symphonia`)

crates/bevy_audio/Cargo.toml

@@ -38,7 +38,6 @@ bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev", default-featu
 ] }
 
 [features]
-fallback-mp3 = ["rodio/minimp3"]
 fallback-flac = ["rodio/claxon"]
 fallback-wav = ["rodio/hound"]
 # TODO: Swap fallback-vorbis and vorbis features

crates/bevy_audio/src/audio_source.rs

@@ -31,7 +31,7 @@ impl AsRef<[u8]> for AudioSource {
 /// This asset loader supports different audio formats based on the enable Bevy features.
 /// The feature `bevy/vorbis` enables loading from `.ogg` files and is enabled by default.
 /// Other file extensions can be loaded from with additional features:
-/// `.mp3` with `bevy/mp3` or `bevy/fallback-mp3`
+/// `.mp3` with `bevy/mp3`
 /// `.flac` with `bevy/flac` or `bevy/fallback-flac`
 /// `.wav` with `bevy/wav` or `bevy/fallback-wav`
 /// The `bevy/audio-all` feature will enable all file extensions.
@@ -58,7 +58,7 @@ impl AssetLoader for AudioLoader {
 
     fn extensions(&self) -> &[&str] {
         &[
-            #[cfg(any(feature = "mp3", feature = "fallback-mp3", feature = "audio-all"))]
+            #[cfg(any(feature = "mp3", feature = "audio-all"))]
             "mp3",
             #[cfg(any(feature = "flac", feature = "fallback-flac", feature = "audio-all"))]
             "flac",

crates/bevy_internal/Cargo.toml

@@ -96,7 +96,6 @@ wav = ["bevy_audio/wav"]
 aac = ["bevy_audio/aac"]
 audio-all = ["bevy_audio/audio-all"]
 fallback-flac = ["bevy_audio/fallback-flac"]
-fallback-mp3 = ["bevy_audio/fallback-mp3"]
 fallback-vorbis = ["bevy_audio/fallback-vorbis"]
 fallback-wav = ["bevy_audio/fallback-wav"]
 

docs/cargo_features.md

@@ -123,7 +123,6 @@ This is the complete `bevy` cargo feature list, without "profiles" or "collectio
 |experimental_pbr_pcss|Enable support for PCSS, at the risk of blowing past the global, per-shader sampler limit on older/lower-end GPUs|
 |exr|EXR image format support|
 |fallback-flac|FLAC audio format support (through `claxon`)|
-|fallback-mp3|MP3 audio format support (through `minimp3`)|
 |fallback-vorbis|OGG/VORBIS audio format support (through `lewton`)|
 |fallback-wav|WAV audio format support (through `hound`)|
 |ff|Farbfeld image format support|