diff --git a/Cargo.toml b/Cargo.toml index aa136146a..b0198125a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,6 +37,8 @@ serde_json = "1" simd-json = { features = ["serde_impl"], optional = true, version = "0.7.0" } socket2 = { optional = true, version = "0.4" } streamcatcher = { optional = true, version = "1" } +symphonia = { default_features = false, optional = true, version = "0.5.2" } +symphonia-core = { optional = true, version = "0.5.2" } tokio = { default-features = false, optional = true, version = "1.0" } tokio-tungstenite = { optional = true, version = "0.18" } tokio-util = { features = ["io"], optional = true, version = "0.7" } @@ -59,21 +61,10 @@ optional = true version = "0.11" optional = true -[dependencies.symphonia] -git = "https://github.com/pdeljanov/Symphonia" -default-features = false -optional = true -version = "0.5" - -[dependencies.symphonia-core] -git = "https://github.com/pdeljanov/Symphonia" -optional = true -version = "0.5" - [dev-dependencies] criterion = "0.4" ntest = "0.9" -symphonia = { version = "0.5", features = ["aac", "isomp4", "mp3"], git = "https://github.com/pdeljanov/Symphonia" } +symphonia = { version = "0.5.2", features = ["aac", "isomp4", "mp3"] } utils = { path = "utils" } tokio = { version = "1", features = ["rt", "rt-multi-thread"] } diff --git a/README.md b/README.md index 68b2d55ad..4e81a1091 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,6 @@ features = ["builtin-queue"] [dependencies.symphonia] # version = "0.5" features = ["aac", "mp3", "isomp4", "alac"] # ...as well as any extras you need! -# **NOTE**: For now, please use this repository in pre-releases. -git = "https://github.com/pdeljanov/Symphonia" ``` ## Dependencies diff --git a/examples/serenity/voice/Cargo.toml b/examples/serenity/voice/Cargo.toml index e82b68613..1d7cb5287 100644 --- a/examples/serenity/voice/Cargo.toml +++ b/examples/serenity/voice/Cargo.toml @@ -5,16 +5,12 @@ authors = ["my name "] edition = "2021" [dependencies] +symphonia = { features = ["aac", "mp3", "isomp4", "alac"], version = "0.5.2" } tracing = "0.1" tracing-subscriber = "0.2" tracing-futures = "0.2" reqwest = "0.11" -[dependencies.symphonia] -version = "0.5" -features = ["aac", "mp3", "isomp4", "alac"] -git = "https://github.com/pdeljanov/Symphonia" - [dependencies.songbird] path = "../../../" diff --git a/examples/serenity/voice_cached_audio/Cargo.toml b/examples/serenity/voice_cached_audio/Cargo.toml index 5657f28f1..3af78c4ed 100644 --- a/examples/serenity/voice_cached_audio/Cargo.toml +++ b/examples/serenity/voice_cached_audio/Cargo.toml @@ -5,6 +5,7 @@ authors = ["my name "] edition = "2021" [dependencies] +symphonia = { features = ["mp3"], version = "0.5.2" } tracing = "0.1" tracing-subscriber = "0.2" tracing-futures = "0.2" @@ -16,11 +17,6 @@ path = "../../../" version = "0.11" features = ["cache", "framework", "standard_framework", "voice", "http", "rustls_backend"] -[dependencies.symphonia] -version = "0.5" -features = ["mp3"] -git = "https://github.com/pdeljanov/Symphonia" - [dependencies.tokio] version = "1.0" features = ["macros", "rt-multi-thread"] diff --git a/examples/serenity/voice_events_queue/Cargo.toml b/examples/serenity/voice_events_queue/Cargo.toml index acec17758..a63f6a202 100644 --- a/examples/serenity/voice_events_queue/Cargo.toml +++ b/examples/serenity/voice_events_queue/Cargo.toml @@ -6,6 +6,7 @@ edition = "2021" [dependencies] reqwest = "0.11" +symphonia = { features = ["aac", "mp3", "isomp4", "alac"], version = "0.5.2" } tracing = "0.1" tracing-subscriber = "0.2" tracing-futures = "0.2" @@ -18,11 +19,6 @@ path = "../../../" version = "0.11" features = ["cache", "standard_framework", "voice", "rustls_backend"] -[dependencies.symphonia] -version = "0.5" -features = ["aac", "mp3", "isomp4", "alac"] -git = "https://github.com/pdeljanov/Symphonia" - [dependencies.tokio] version = "1.0" features = ["macros", "rt-multi-thread", "signal"] diff --git a/examples/twilight/Cargo.toml b/examples/twilight/Cargo.toml index 62f3996f5..efb2bfd61 100644 --- a/examples/twilight/Cargo.toml +++ b/examples/twilight/Cargo.toml @@ -7,6 +7,7 @@ edition = "2021" [dependencies] futures = "0.3" reqwest = "0.11" +symphonia = { features = ["aac", "mp3", "isomp4", "alac"], version = "0.5.2" } tracing = "0.1" tracing-subscriber = "0.2" tokio = { features = ["macros", "rt-multi-thread", "sync"], version = "1" } @@ -19,8 +20,3 @@ twilight-standby = "0.14" default-features = false path = "../.." features = ["driver", "gateway", "twilight", "rustls"] - -[dependencies.symphonia] -version = "0.5" -features = ["aac", "mp3", "isomp4", "alac"] -git = "https://github.com/pdeljanov/Symphonia"