From acfd53a0fce2bcde98955124cdacfc8218c3fc5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9E=97=E4=BC=9F?= Date: Wed, 1 Mar 2023 03:22:46 +0000 Subject: [PATCH] Remove redundant symphonia-mp3 feature (#7852) # Objective - Fixes https://github.com/bevyengine/bevy/issues/7848. ## Solution - remove the symphonia-mp3 feature and add a minimp3 feature instead. --- Cargo.toml | 6 +++--- crates/bevy_audio/Cargo.toml | 2 +- crates/bevy_internal/Cargo.toml | 2 +- docs/cargo_features.md | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d22bcb06bd..f334b03b4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -155,6 +155,9 @@ vorbis = ["bevy_internal/vorbis"] # WAV audio format support wav = ["bevy_internal/wav"] +# MP3 audio format support (through minimp3) +minimp3 = ["bevy_internal/minimp3"] + # AAC audio format support (through symphonia) symphonia-aac = ["bevy_internal/symphonia-aac"] @@ -167,9 +170,6 @@ symphonia-flac = ["bevy_internal/symphonia-flac"] # MP4 audio format support (through symphonia) symphonia-isomp4 = ["bevy_internal/symphonia-isomp4"] -# MP3 audio format support (through symphonia) -symphonia-mp3 = ["bevy_internal/symphonia-mp3"] - # OGG/VORBIS audio format support (through symphonia) symphonia-vorbis = ["bevy_internal/symphonia-vorbis"] diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml index 43902b12aa..b96495e51d 100644 --- a/crates/bevy_audio/Cargo.toml +++ b/crates/bevy_audio/Cargo.toml @@ -35,11 +35,11 @@ mp3 = ["rodio/mp3"] flac = ["rodio/flac"] wav = ["rodio/wav"] vorbis = ["rodio/vorbis"] +minimp3 = ["rodio/minimp3"] symphonia-aac = ["rodio/symphonia-aac"] symphonia-all = ["rodio/symphonia-all"] symphonia-flac = ["rodio/symphonia-flac"] symphonia-isomp4 = ["rodio/symphonia-isomp4"] -symphonia-mp3 = ["rodio/symphonia-mp3"] symphonia-vorbis = ["rodio/symphonia-vorbis"] symphonia-wav = ["rodio/symphonia-wav"] # Enable using a shared stdlib for cxx on Android. diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml index 0166d797f7..3bbb87ca1d 100644 --- a/crates/bevy_internal/Cargo.toml +++ b/crates/bevy_internal/Cargo.toml @@ -47,11 +47,11 @@ flac = ["bevy_audio/flac"] mp3 = ["bevy_audio/mp3"] vorbis = ["bevy_audio/vorbis"] wav = ["bevy_audio/wav"] +minimp3 = ["bevy_audio/minimp3"] symphonia-aac = ["bevy_audio/symphonia-aac"] symphonia-all = ["bevy_audio/symphonia-all"] symphonia-flac = ["bevy_audio/symphonia-flac"] symphonia-isomp4 = ["bevy_audio/symphonia-isomp4"] -symphonia-mp3 = ["bevy_audio/symphonia-mp3"] symphonia-vorbis = ["bevy_audio/symphonia-vorbis"] symphonia-wav = ["bevy_audio/symphonia-wav"] diff --git a/docs/cargo_features.md b/docs/cargo_features.md index 6f8adfa702..7bfbf9330c 100644 --- a/docs/cargo_features.md +++ b/docs/cargo_features.md @@ -50,6 +50,7 @@ The default feature set enables most of the expected features of a game engine, |exr|EXR image format support| |flac|FLAC audio format support| |jpeg|JPEG image format support| +|minimp3|MP3 audio format support (through minimp3)| |mp3|MP3 audio format support| |serialize|Enable serialization support through serde| |subpixel_glyph_atlas|Enable rendering of font glyphs using subpixel accuracy| @@ -57,7 +58,6 @@ The default feature set enables most of the expected features of a game engine, |symphonia-all|AAC, FLAC, MP3, MP4, OGG/VORBIS, and WAV audio formats support (through symphonia)| |symphonia-flac|FLAC audio format support (through symphonia)| |symphonia-isomp4|MP4 audio format support (through symphonia)| -|symphonia-mp3|MP3 audio format support (through symphonia)| |symphonia-vorbis|OGG/VORBIS audio format support (through symphonia)| |symphonia-wav|WAV audio format support (through symphonia)| |tga|TGA image format support|