173 lines
6.5 KiB
Diff
173 lines
6.5 KiB
Diff
|
diff --git a/Cargo.lock b/Cargo.lock
|
||
|
index 09a084648..047210eac 100644
|
||
|
--- a/Cargo.lock
|
||
|
+++ b/Cargo.lock
|
||
|
@@ -812,7 +812,7 @@ dependencies = [
|
||
|
"alsa",
|
||
|
"core-foundation-sys 0.8.4",
|
||
|
"coreaudio-rs",
|
||
|
- "dasp_sample 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||
|
+ "dasp_sample",
|
||
|
"jni 0.19.0",
|
||
|
"js-sys",
|
||
|
"libc",
|
||
|
@@ -1068,7 +1068,7 @@ dependencies = [
|
||
|
[[package]]
|
||
|
name = "dasp"
|
||
|
version = "0.11.0"
|
||
|
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
dependencies = [
|
||
|
"dasp_envelope",
|
||
|
"dasp_frame",
|
||
|
@@ -1076,7 +1076,7 @@ dependencies = [
|
||
|
"dasp_peak",
|
||
|
"dasp_ring_buffer",
|
||
|
"dasp_rms",
|
||
|
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
|
||
|
+ "dasp_sample",
|
||
|
"dasp_signal",
|
||
|
"dasp_slice",
|
||
|
"dasp_window",
|
||
|
@@ -1085,72 +1085,66 @@ dependencies = [
|
||
|
[[package]]
|
||
|
name = "dasp_envelope"
|
||
|
version = "0.11.0"
|
||
|
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
dependencies = [
|
||
|
"dasp_frame",
|
||
|
"dasp_peak",
|
||
|
"dasp_ring_buffer",
|
||
|
"dasp_rms",
|
||
|
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
|
||
|
+ "dasp_sample",
|
||
|
]
|
||
|
|
||
|
[[package]]
|
||
|
name = "dasp_frame"
|
||
|
version = "0.11.0"
|
||
|
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
dependencies = [
|
||
|
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
|
||
|
+ "dasp_sample",
|
||
|
]
|
||
|
|
||
|
[[package]]
|
||
|
name = "dasp_interpolate"
|
||
|
version = "0.11.0"
|
||
|
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
dependencies = [
|
||
|
"dasp_frame",
|
||
|
"dasp_ring_buffer",
|
||
|
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
|
||
|
+ "dasp_sample",
|
||
|
]
|
||
|
|
||
|
[[package]]
|
||
|
name = "dasp_peak"
|
||
|
version = "0.11.0"
|
||
|
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
dependencies = [
|
||
|
"dasp_frame",
|
||
|
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
|
||
|
+ "dasp_sample",
|
||
|
]
|
||
|
|
||
|
[[package]]
|
||
|
name = "dasp_ring_buffer"
|
||
|
version = "0.11.0"
|
||
|
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
|
||
|
[[package]]
|
||
|
name = "dasp_rms"
|
||
|
version = "0.11.0"
|
||
|
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
dependencies = [
|
||
|
"dasp_frame",
|
||
|
"dasp_ring_buffer",
|
||
|
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
|
||
|
+ "dasp_sample",
|
||
|
]
|
||
|
|
||
|
[[package]]
|
||
|
name = "dasp_sample"
|
||
|
version = "0.11.0"
|
||
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||
|
-checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
|
||
|
-
|
||
|
-[[package]]
|
||
|
-name = "dasp_sample"
|
||
|
-version = "0.11.0"
|
||
|
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
|
||
|
[[package]]
|
||
|
name = "dasp_signal"
|
||
|
version = "0.11.0"
|
||
|
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
dependencies = [
|
||
|
"dasp_envelope",
|
||
|
"dasp_frame",
|
||
|
@@ -1158,25 +1152,25 @@ dependencies = [
|
||
|
"dasp_peak",
|
||
|
"dasp_ring_buffer",
|
||
|
"dasp_rms",
|
||
|
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
|
||
|
+ "dasp_sample",
|
||
|
"dasp_window",
|
||
|
]
|
||
|
|
||
|
[[package]]
|
||
|
name = "dasp_slice"
|
||
|
version = "0.11.0"
|
||
|
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
dependencies = [
|
||
|
"dasp_frame",
|
||
|
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
|
||
|
+ "dasp_sample",
|
||
|
]
|
||
|
|
||
|
[[package]]
|
||
|
name = "dasp_window"
|
||
|
version = "0.11.0"
|
||
|
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
|
||
|
dependencies = [
|
||
|
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
|
||
|
+ "dasp_sample",
|
||
|
]
|
||
|
|
||
|
[[package]]
|
||
|
diff --git a/Cargo.toml b/Cargo.toml
|
||
|
index c3d25e662..fba44c9e6 100644
|
||
|
--- a/Cargo.toml
|
||
|
+++ b/Cargo.toml
|
||
|
@@ -71,3 +71,6 @@ inherits = "release"
|
||
|
|
||
|
[profile.web-wasm-extensions]
|
||
|
inherits = "release"
|
||
|
+
|
||
|
+[patch.crates-io]
|
||
|
+dasp_sample = { git = "https://github.com/RustAudio/dasp", rev = "f05a703d247bb504d7e812b51e95f3765d9c5e94" }
|
||
|
diff --git a/core/Cargo.toml b/core/Cargo.toml
|
||
|
index ef2210484..1123911d6 100644
|
||
|
--- a/core/Cargo.toml
|
||
|
+++ b/core/Cargo.toml
|
||
|
@@ -42,7 +42,7 @@ nellymoser-rs = { git = "https://github.com/ruffle-rs/nellymoser", rev = "4a3352
|
||
|
regress = "0.5"
|
||
|
flash-lso = { git = "https://github.com/ruffle-rs/rust-flash-lso", rev = "8376453eddddbe701031a091c0eed94068fa5649" }
|
||
|
lzma-rs = {version = "0.3.0", optional = true }
|
||
|
-dasp = { git = "https://github.com/RustAudio/dasp", rev = "f05a703", features = ["interpolate", "interpolate-linear", "signal"], optional = true }
|
||
|
+dasp = { git = "https://github.com/RustAudio/dasp", rev = "f05a703d247bb504d7e812b51e95f3765d9c5e94", features = ["interpolate", "interpolate-linear", "signal"], optional = true }
|
||
|
symphonia = { version = "0.5.2", default-features = false, features = ["mp3"], optional = true }
|
||
|
enumset = "1.0.12"
|
||
|
bytemuck = "1.13.1"
|