servius/songbird
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deps: Move symphonia back to mainline repo.

Browse Source 
Temporary measure until symphonia 0.5.2 is released. Should allow us to merge #143 now that all our API additions and fixes are in.
This commit is contained in:
Kyle Simpson
2022-12-15 19:08:50 +00:00
parent f72175b799
commit b7e40ab5e4
6 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.toml
View File

@@ -59,22 +59,20 @@ version = "0.11"
optional = true optional = true
[dependencies.symphonia] [dependencies.symphonia]
branch = "songbird-fixes" git = "https://github.com/pdeljanov/Symphonia"
git = "https://github.com/FelixMcFelix/Symphonia"
default-features = false default-features = false
optional = true optional = true
version = "0.5" version = "0.5"
[dependencies.symphonia-core] [dependencies.symphonia-core]
branch = "songbird-fixes" git = "https://github.com/pdeljanov/Symphonia"
git = "https://github.com/FelixMcFelix/Symphonia"
optional = true optional = true
version = "0.5" version = "0.5"
[dev-dependencies] [dev-dependencies]
criterion = "0.4" criterion = "0.4"
ntest = "0.9" ntest = "0.9"
symphonia = { version = "0.5", features = ["aac", "isomp4", "mp3"], git = "https://github.com/FelixMcFelix/Symphonia", branch = "songbird-fixes" } symphonia = { version = "0.5", features = ["aac", "isomp4", "mp3"], git = "https://github.com/pdeljanov/Symphonia" }
utils = { path = "utils" } utils = { path = "utils" }
tokio = { version = "1", features = ["rt", "rt-multi-thread"] } tokio = { version = "1", features = ["rt", "rt-multi-thread"] }

6
README.md
View File

@@ -39,10 +39,8 @@ features = ["builtin-queue"]
[dependencies.symphonia] [dependencies.symphonia]
# version = "0.5" # version = "0.5"
features = ["aac", "mp3", "isomp4", "alac"] # ...as well as any extras you need! features = ["aac", "mp3", "isomp4", "alac"] # ...as well as any extras you need!
# **NOTE**: For now, please use this fork in pre-releases for a key fix to # **NOTE**: For now, please use this repository in pre-releases.
# seeking on streamed MKV/WebM files. git = "https://github.com/pdeljanov/Symphonia"
git = "https://github.com/FelixMcFelix/Symphonia"
branch = "songbird-fixes"
``` ```
## Dependencies ## Dependencies

3
examples/serenity/voice/Cargo.toml
View File

@@ -13,8 +13,7 @@ reqwest = "0.11"
[dependencies.symphonia] [dependencies.symphonia]
version = "0.5" version = "0.5"
features = ["aac", "mp3", "isomp4", "alac"] features = ["aac", "mp3", "isomp4", "alac"]
git = "https://github.com/FelixMcFelix/Symphonia" git = "https://github.com/pdeljanov/Symphonia"
branch = "songbird-fixes"
[dependencies.songbird] [dependencies.songbird]
path = "../../../" path = "../../../"

3
examples/serenity/voice_cached_audio/Cargo.toml
View File

@@ -19,8 +19,7 @@ features = ["cache", "framework", "standard_framework", "voice", "http", "rustls
[dependencies.symphonia] [dependencies.symphonia]
version = "0.5" version = "0.5"
features = ["mp3"] features = ["mp3"]
git = "https://github.com/FelixMcFelix/Symphonia" git = "https://github.com/pdeljanov/Symphonia"
branch = "songbird-fixes"
[dependencies.tokio] [dependencies.tokio]
version = "1.0" version = "1.0"

3
examples/serenity/voice_events_queue/Cargo.toml
View File

@@ -21,8 +21,7 @@ features = ["cache", "standard_framework", "voice", "rustls_backend"]
[dependencies.symphonia] [dependencies.symphonia]
version = "0.5" version = "0.5"
features = ["aac", "mp3", "isomp4", "alac"] features = ["aac", "mp3", "isomp4", "alac"]
git = "https://github.com/FelixMcFelix/Symphonia" git = "https://github.com/pdeljanov/Symphonia"
branch = "songbird-fixes"
[dependencies.tokio] [dependencies.tokio]
version = "1.0" version = "1.0"

3
examples/twilight/Cargo.toml
View File

@@ -23,5 +23,4 @@ features = ["driver", "gateway", "twilight", "rustls"]
[dependencies.symphonia] [dependencies.symphonia]
version = "0.5" version = "0.5"
features = ["aac", "mp3", "isomp4", "alac"] features = ["aac", "mp3", "isomp4", "alac"]
git = "https://github.com/FelixMcFelix/Symphonia" git = "https://github.com/pdeljanov/Symphonia"
branch = "songbird-fixes"