Deps: Move symphonia back to mainline repo.

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.
serenity-rs · Nov 20, 2023 · b7e40ab · b7e40ab
1 parent f72175b
commit b7e40ab
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 17 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -59,22 +59,20 @@ version = "0.11"
 optional = true
 
 [dependencies.symphonia]
-branch = "songbird-fixes"
-git = "https://github.com/FelixMcFelix/Symphonia"
+git = "https://github.com/pdeljanov/Symphonia"
 default-features = false
 optional = true
 version = "0.5"
 
 [dependencies.symphonia-core]
-branch = "songbird-fixes"
-git = "https://github.com/FelixMcFelix/Symphonia"
+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/FelixMcFelix/Symphonia", branch = "songbird-fixes" }
+symphonia = { version = "0.5", features = ["aac", "isomp4", "mp3"], git = "https://github.com/pdeljanov/Symphonia" }
 utils = { path = "utils" }
 tokio = { version = "1", features = ["rt", "rt-multi-thread"] }
 

diff --git a/README.md b/README.md
@@ -39,10 +39,8 @@ 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 fork in pre-releases for a key fix to
-# seeking on streamed MKV/WebM files.
-git = "https://github.com/FelixMcFelix/Symphonia"
-branch = "songbird-fixes"
+# **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
@@ -13,8 +13,7 @@ reqwest = "0.11"
 [dependencies.symphonia]
 version = "0.5"
 features = ["aac", "mp3", "isomp4", "alac"]
-git = "https://github.com/FelixMcFelix/Symphonia"
-branch = "songbird-fixes"
+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
@@ -19,8 +19,7 @@ features = ["cache", "framework", "standard_framework", "voice", "http", "rustls
 [dependencies.symphonia]
 version = "0.5"
 features = ["mp3"]
-git = "https://github.com/FelixMcFelix/Symphonia"
-branch = "songbird-fixes"
+git = "https://github.com/pdeljanov/Symphonia"
 
 [dependencies.tokio]
 version = "1.0"

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

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