frontend-utils: Move WinitAsyncExecutor from Desktop
This commit is contained in:
parent
3529a2d12d
commit
29e515c672
|
@ -4359,7 +4359,6 @@ dependencies = [
|
||||||
"ruffle_render",
|
"ruffle_render",
|
||||||
"ruffle_render_wgpu",
|
"ruffle_render_wgpu",
|
||||||
"ruffle_video_software",
|
"ruffle_video_software",
|
||||||
"slotmap",
|
|
||||||
"sys-locale",
|
"sys-locale",
|
||||||
"tokio",
|
"tokio",
|
||||||
"toml_edit 0.22.9",
|
"toml_edit 0.22.9",
|
||||||
|
@ -4381,7 +4380,9 @@ dependencies = [
|
||||||
name = "ruffle_frontend_utils"
|
name = "ruffle_frontend_utils"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"async-channel 2.2.0",
|
||||||
"ruffle_core",
|
"ruffle_core",
|
||||||
|
"slotmap",
|
||||||
"tempfile",
|
"tempfile",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"toml_edit 0.22.9",
|
"toml_edit 0.22.9",
|
||||||
|
|
|
@ -27,7 +27,6 @@ ruffle_frontend_utils = { path = "../frontend-utils" }
|
||||||
tracing = { workspace = true }
|
tracing = { workspace = true }
|
||||||
tracing-subscriber = { workspace = true }
|
tracing-subscriber = { workspace = true }
|
||||||
tracing-appender = "0.2.3"
|
tracing-appender = "0.2.3"
|
||||||
slotmap = { workspace = true }
|
|
||||||
winit = "0.29.15"
|
winit = "0.29.15"
|
||||||
webbrowser = "0.8.14"
|
webbrowser = "0.8.14"
|
||||||
url = { workspace = true }
|
url = { workspace = true }
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
//! Navigator backend for web
|
//! Navigator backend for web
|
||||||
|
|
||||||
use crate::executor::FutureSpawner;
|
|
||||||
use crate::player::PlayingContent;
|
use crate::player::PlayingContent;
|
||||||
use async_channel::{Receiver, Sender, TryRecvError};
|
use async_channel::{Receiver, Sender, TryRecvError};
|
||||||
use async_io::Timer;
|
use async_io::Timer;
|
||||||
|
@ -21,6 +20,7 @@ use ruffle_core::backend::navigator::{
|
||||||
use ruffle_core::indexmap::IndexMap;
|
use ruffle_core::indexmap::IndexMap;
|
||||||
use ruffle_core::loader::Error;
|
use ruffle_core::loader::Error;
|
||||||
use ruffle_core::socket::{ConnectionState, SocketAction, SocketHandle};
|
use ruffle_core::socket::{ConnectionState, SocketAction, SocketHandle};
|
||||||
|
use ruffle_frontend_utils::backends::executor::FutureSpawner;
|
||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
use std::io;
|
use std::io;
|
||||||
use std::io::ErrorKind;
|
use std::io::ErrorKind;
|
||||||
|
|
|
@ -10,12 +10,10 @@ mod app;
|
||||||
mod backends;
|
mod backends;
|
||||||
mod cli;
|
mod cli;
|
||||||
mod custom_event;
|
mod custom_event;
|
||||||
mod executor;
|
|
||||||
mod gui;
|
mod gui;
|
||||||
mod log;
|
mod log;
|
||||||
mod player;
|
mod player;
|
||||||
mod preferences;
|
mod preferences;
|
||||||
mod task;
|
|
||||||
mod time_demo;
|
mod time_demo;
|
||||||
mod util;
|
mod util;
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,6 @@ use crate::backends::{
|
||||||
ExternalNavigatorBackend,
|
ExternalNavigatorBackend,
|
||||||
};
|
};
|
||||||
use crate::custom_event::RuffleEvent;
|
use crate::custom_event::RuffleEvent;
|
||||||
use crate::executor::{PollRequester, WinitAsyncExecutor};
|
|
||||||
use crate::gui::MovieView;
|
use crate::gui::MovieView;
|
||||||
use crate::preferences::GlobalPreferences;
|
use crate::preferences::GlobalPreferences;
|
||||||
use crate::{CALLSTACK, RENDER_INFO, SWF_INFO};
|
use crate::{CALLSTACK, RENDER_INFO, SWF_INFO};
|
||||||
|
@ -16,6 +15,7 @@ use ruffle_core::{
|
||||||
DefaultFont, LoadBehavior, Player, PlayerBuilder, PlayerEvent, PlayerRuntime, StageAlign,
|
DefaultFont, LoadBehavior, Player, PlayerBuilder, PlayerEvent, PlayerRuntime, StageAlign,
|
||||||
StageScaleMode,
|
StageScaleMode,
|
||||||
};
|
};
|
||||||
|
use ruffle_frontend_utils::backends::executor::{PollRequester, WinitAsyncExecutor};
|
||||||
use ruffle_frontend_utils::bundle::source::BundleSourceError;
|
use ruffle_frontend_utils::bundle::source::BundleSourceError;
|
||||||
use ruffle_frontend_utils::bundle::{Bundle, BundleError};
|
use ruffle_frontend_utils::bundle::{Bundle, BundleError};
|
||||||
use ruffle_render::backend::RenderBackend;
|
use ruffle_render::backend::RenderBackend;
|
||||||
|
|
|
@ -18,6 +18,8 @@ thiserror = { workspace = true }
|
||||||
zip = "0.6.6"
|
zip = "0.6.6"
|
||||||
urlencoding = "2.1.3"
|
urlencoding = "2.1.3"
|
||||||
ruffle_core = { path = "../core", default-features = false }
|
ruffle_core = { path = "../core", default-features = false }
|
||||||
|
async-channel = { workspace = true }
|
||||||
|
slotmap = { workspace = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
tempfile = "3"
|
tempfile = "3"
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
|
pub mod executor;
|
||||||
pub mod storage;
|
pub mod storage;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
//! Async executor
|
mod task;
|
||||||
|
|
||||||
use crate::task::Task;
|
pub use crate::backends::executor::task::Task;
|
||||||
use async_channel::{unbounded, Receiver, Sender};
|
use async_channel::{unbounded, Receiver, Sender};
|
||||||
use ruffle_core::backend::navigator::OwnedFuture;
|
use ruffle_core::backend::navigator::OwnedFuture;
|
||||||
use ruffle_core::loader::Error;
|
use ruffle_core::loader::Error;
|
Loading…
Reference in New Issue