Magic-Mirror/ruffle-android
1
0
Fork 0
mirror of https://github.com/ruffle-rs/ruffle-android.git synced 2024-11-26 23:20:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update some Rust dependencies

Browse Source
This commit is contained in:
TÖRÖK Attila 2023-10-16 00:51:47 +02:00
parent 83497e0863
commit 1394e5e2cf
3 changed files with 268 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

468
native/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

14
native/Cargo.toml
View File

@ -18,11 +18,12 @@ android-activity = { version = "0.4.3", features = ["game-activity"] }
android_logger = "0.13.3"
jni = "0.21.1"
ndk = { version = "0.7.0", features = ["audio"] }
ndk = { version = "0.8.0", features = ["audio"] }
ndk-context = "0.1.1"
winit = { version = "0.28.6", features = ["android-game-activity"] }
wgpu = "0.17.0"
winit = { version = "0.28.7", features = ["android-game-activity"] }
# Have to follow Ruffle with this.
wgpu = { git = "https://github.com/gfx-rs/wgpu", branch = "v0.17" }
ruffle_core = { git = "https://github.com/ruffle-rs/ruffle.git", branch = "master", features = [
"audio",
@ -41,3 +42,10 @@ log-panics = { version = "2.1.0", features = ["with-backtrace"]}
url = "2.4.1"
generational-arena = "0.2.9"
async-channel = "1.9.0"
# Have to follow Ruffle with this.
[patch.'https://github.com/gfx-rs/naga']
naga = "0.13.0"
[patch.crates-io]
wgpu = { git = "https://github.com/gfx-rs/wgpu", branch = "v0.17" }

2
native/src/audio.rs
View File

@ -56,7 +56,7 @@ impl AAudioAudioBackend {
}
pub fn recreate_stream_if_needed(&mut self) {
let stream_state = self.stream.as_ref().unwrap().get_state().unwrap();
let stream_state = self.stream.as_ref().unwrap().state().unwrap();
if stream_state == AudioStreamState::Disconnected {
// I'm sure it's fine...
let _ = self.recreate_stream();