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

chore: Update Ruffle and Rust dependencies

Browse Source
This commit is contained in:
TÖRÖK Attila 2024-03-04 09:31:48 +01:00
parent 9513c68b8e
commit c23fbced27
4 changed files with 196 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

360
native/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

6
native/Cargo.toml
View File

@ -22,8 +22,8 @@ ndk = { version = "0.8.0", features = ["audio"] }
ndk-context = "0.1.1"
# Have to follow Ruffle with these.
winit = { version = "0.29.10", features = ["android-game-activity"] }
wgpu = "0.19.1"
winit = { version = "0.29.13", features = ["android-game-activity"] }
wgpu = "0.19.3"
ruffle_core = { git = "https://github.com/ruffle-rs/ruffle.git", branch = "master", features = [
"audio",
@ -39,7 +39,7 @@ ruffle_render_wgpu = { git = "https://github.com/ruffle-rs/ruffle.git", branch =
ruffle_video = { git = "https://github.com/ruffle-rs/ruffle.git", branch = "master" }
ruffle_video_software = { git = "https://github.com/ruffle-rs/ruffle.git", branch = "master" }
log = "0.4.20"
log = "0.4.21"
log-panics = { version = "2.1.0", features = ["with-backtrace"]}
url = "2.5.0"

4
native/src/executor.rs
View File

@ -5,7 +5,7 @@ use crate::task::Task;
use generational_arena::{Arena, Index};
use ruffle_core::backend::navigator::OwnedFuture;
use ruffle_core::loader::Error;
use std::sync::mpsc::{channel, Receiver, Sender};
use async_channel::{unbounded, Receiver, Sender};
use std::sync::{Arc, Mutex, Weak};
use std::task::{Context, Poll, RawWaker, RawWakerVTable, Waker};
use winit::event_loop::EventLoopProxy;
@ -146,7 +146,7 @@ impl WinitAsyncExecutor {
pub fn new(
event_loop: EventLoopProxy<RuffleEvent>,
) -> (Arc<Mutex<Self>>, Sender<OwnedFuture<(), Error>>) {
let (send, recv) = channel();
let (send, recv) = unbounded();
let new_self = Arc::new_cyclic(|self_ref| {
Mutex::new(Self {
task_queue: Arena::new(),

8
native/src/navigator.rs
View File

@ -10,8 +10,7 @@ use ruffle_core::indexmap::IndexMap;
use ruffle_core::loader::Error;
use ruffle_core::socket::{ConnectionState, SocketAction, SocketHandle};
use async_channel::Receiver;
use std::sync::mpsc::Sender;
use async_channel::{Sender, Receiver};
use std::time::Duration;
use url::{ParseError, Url};
@ -178,7 +177,7 @@ impl NavigatorBackend for ExternalNavigatorBackend {
}
fn spawn_future(&mut self, future: OwnedFuture<(), Error>) {
self.channel.send(future).expect("working channel send");
self.channel.send(future);
if self.event_loop.send_event(RuffleEvent::TaskPoll).is_err() {
log::warn!(
@ -204,7 +203,6 @@ impl NavigatorBackend for ExternalNavigatorBackend {
sender: Sender<SocketAction>,
) {
sender
.send(SocketAction::Connect(handle, ConnectionState::Failed))
.expect("working channel send");
.send(SocketAction::Connect(handle, ConnectionState::Failed));
}
}