Skip to content

Commit 30491c8

Browse files
dependabot[bot]torokati44
dependabot[bot]
authored and
torokati44
committed
Bump the ruffle group with 9 updates
Bumps the ruffle group with 9 updates: | Package | From | To | | --- | --- | --- | | [ruffle_core](https://github.com/ruffle-rs/ruffle) | ``4b7fbd5`` | ``7b91cc6`` | | [ruffle_render_wgpu](https://github.com/ruffle-rs/ruffle) | ``4b7fbd5`` | ``7b91cc6`` | | [ruffle_video_software](https://github.com/ruffle-rs/ruffle) | ``4b7fbd5`` | ``7b91cc6`` | | [ruffle_frontend_utils](https://github.com/ruffle-rs/ruffle) | ``4b7fbd5`` | ``7b91cc6`` | | ruffle_gc_arena | ``4b7fbd5`` | ``7b91cc6`` | | ruffle_macros | ``4b7fbd5`` | ``7b91cc6`` | | ruffle_render | ``4b7fbd5`` | ``7b91cc6`` | | ruffle_video | ``4b7fbd5`` | ``7b91cc6`` | | ruffle_wstr | ``4b7fbd5`` | ``7b91cc6`` | Updates `ruffle_core` from `4b7fbd5` to `7b91cc6` - [Release notes](https://github.com/ruffle-rs/ruffle/releases) - [Commits](ruffle-rs/ruffle@4b7fbd5...7b91cc6) Updates `ruffle_render_wgpu` from `4b7fbd5` to `7b91cc6` - [Release notes](https://github.com/ruffle-rs/ruffle/releases) - [Commits](ruffle-rs/ruffle@4b7fbd5...7b91cc6) Updates `ruffle_video_software` from `4b7fbd5` to `7b91cc6` - [Release notes](https://github.com/ruffle-rs/ruffle/releases) - [Commits](ruffle-rs/ruffle@4b7fbd5...7b91cc6) Updates `ruffle_frontend_utils` from `4b7fbd5` to `7b91cc6` - [Release notes](https://github.com/ruffle-rs/ruffle/releases) - [Commits](ruffle-rs/ruffle@4b7fbd5...7b91cc6) Updates `ruffle_gc_arena` from `4b7fbd5` to `7b91cc6` Updates `ruffle_macros` from `4b7fbd5` to `7b91cc6` Updates `ruffle_render` from `4b7fbd5` to `7b91cc6` Updates `ruffle_video` from `4b7fbd5` to `7b91cc6` Updates `ruffle_wstr` from `4b7fbd5` to `7b91cc6` --- updated-dependencies: - dependency-name: ruffle_core dependency-version: 7b91cc683688bd3324e42347437bec1aabbaecfe dependency-type: direct:production dependency-group: ruffle - dependency-name: ruffle_render_wgpu dependency-version: 7b91cc683688bd3324e42347437bec1aabbaecfe dependency-type: direct:production dependency-group: ruffle - dependency-name: ruffle_video_software dependency-version: 7b91cc683688bd3324e42347437bec1aabbaecfe dependency-type: direct:production dependency-group: ruffle - dependency-name: ruffle_frontend_utils dependency-version: 7b91cc683688bd3324e42347437bec1aabbaecfe dependency-type: direct:production dependency-group: ruffle - dependency-name: ruffle_gc_arena dependency-version: 7b91cc683688bd3324e42347437bec1aabbaecfe dependency-type: indirect dependency-group: ruffle - dependency-name: ruffle_macros dependency-version: 7b91cc683688bd3324e42347437bec1aabbaecfe dependency-type: indirect dependency-group: ruffle - dependency-name: ruffle_render dependency-version: 7b91cc683688bd3324e42347437bec1aabbaecfe dependency-type: indirect dependency-group: ruffle - dependency-name: ruffle_video dependency-version: 7b91cc683688bd3324e42347437bec1aabbaecfe dependency-type: indirect dependency-group: ruffle - dependency-name: ruffle_wstr dependency-version: 7b91cc683688bd3324e42347437bec1aabbaecfe dependency-type: indirect dependency-group: ruffle ... Signed-off-by: dependabot[bot] <[email protected]>
1 parent e42998d commit 30491c8

File tree

2 files changed

+59
-65
lines changed

2 files changed

+59
-65
lines changed

‎Cargo.lock‎

Lines changed: 17 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/lib.rs‎

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ use jni::{
1313
JNIEnv, JavaVM,
1414
};
1515
use keycodes::{android_key_event_to_ruffle_key_descriptor, key_tag_to_key_descriptor};
16+
use std::any::Any;
1617
use std::rc::Rc;
1718
use std::sync::mpsc::Sender;
1819
use std::sync::{mpsc, MutexGuard};
@@ -150,28 +151,30 @@ async fn run(app: AndroidApp) {
150151
// [NA] For some reason we can get negative sizes during a resume...
151152
if window.width() > 0 && window.height() > 0 {
152153
unsafe {
153-
player
154+
let mut player = player
154155
.player
155156
.lock()
156-
.unwrap()
157-
.renderer_mut()
158-
.downcast_mut::<WgpuRenderBackend<SwapChainTarget>>(
159-
)
160-
.unwrap()
161-
.recreate_surface_unsafe(
162-
wgpu::SurfaceTargetUnsafe::RawHandle {
163-
raw_display_handle:
164-
RawDisplayHandle::Android(
165-
AndroidDisplayHandle::new(),
166-
),
167-
raw_window_handle: window
168-
.window_handle()
169-
.unwrap()
170-
.into(),
171-
},
172-
(window.width() as u32, window.height() as u32),
173-
)
174157
.unwrap();
158+
159+
let renderer = <dyn Any>::downcast_mut::<WgpuRenderBackend<SwapChainTarget>>(
160+
player.renderer_mut(),
161+
)
162+
.unwrap();
163+
164+
renderer.recreate_surface_unsafe(
165+
wgpu::SurfaceTargetUnsafe::RawHandle {
166+
raw_display_handle:
167+
RawDisplayHandle::Android(
168+
AndroidDisplayHandle::new(),
169+
),
170+
raw_window_handle: window
171+
.window_handle()
172+
.unwrap()
173+
.into(),
174+
},
175+
(window.width() as u32, window.height() as u32),
176+
)
177+
.unwrap();
175178
}
176179
}
177180
}
@@ -281,23 +284,24 @@ async fn run(app: AndroidApp) {
281284
let player = &playerbox.as_ref().unwrap().player;
282285
let mut player_lock = player.lock().unwrap();
283286
unsafe {
284-
player_lock
285-
.renderer_mut()
286-
.downcast_mut::<WgpuRenderBackend<SwapChainTarget>>()
287-
.unwrap()
288-
.recreate_surface_unsafe(
289-
wgpu::SurfaceTargetUnsafe::RawHandle {
290-
raw_display_handle: RawDisplayHandle::Android(
291-
AndroidDisplayHandle::new(),
292-
),
293-
raw_window_handle: window
294-
.window_handle()
295-
.unwrap()
296-
.into(),
297-
},
298-
(window.width() as u32, window.height() as u32),
299-
)
300-
.unwrap();
287+
let renderer = <dyn Any>::downcast_mut::<WgpuRenderBackend<SwapChainTarget>>(
288+
player_lock.renderer_mut(),
289+
)
290+
.unwrap();
291+
292+
renderer.recreate_surface_unsafe(
293+
wgpu::SurfaceTargetUnsafe::RawHandle {
294+
raw_display_handle: RawDisplayHandle::Android(
295+
AndroidDisplayHandle::new(),
296+
),
297+
raw_window_handle: window
298+
.window_handle()
299+
.unwrap()
300+
.into(),
301+
},
302+
(window.width() as u32, window.height() as u32),
303+
)
304+
.unwrap();
301305
}
302306
player_lock.set_is_playing(true);
303307
}
@@ -470,10 +474,8 @@ async fn run(app: AndroidApp) {
470474
player.tick(dt as f64 / 1000.0);
471475
next_frame_time = Some(new_time + player.time_til_next_frame());
472476
needs_redraw = player.needs_render();
473-
let audio = player
474-
.audio_mut()
475-
.downcast_mut::<AAudioAudioBackend>()
476-
.unwrap();
477+
let audio =
478+
<dyn Any>::downcast_mut::<AAudioAudioBackend>(player.audio_mut()).unwrap();
477479
audio.recreate_stream_if_needed();
478480
}
479481
} else {

0 commit comments

Comments
 (0)