core: Fix a handful of types that were added after this PR was origin…

…ally drafted
ruffle-rs · Nov 30, 2022 · 042ee49 · 042ee49
1 parent a98f3e2
commit 042ee49
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/core/src/duration.rs b/core/src/duration.rs
@@ -10,6 +10,7 @@ pub struct Duration(f64);
 impl Duration {
     pub const ZERO: Self = Self(0.0);
     pub const ONE_SECOND: Self = Self(1.0);
+    pub const MAX: Self = Self(f64::MAX);
 
     pub fn from_secs(secs: f64) -> Self {
         Self::from_nanos(secs * 1_000_000_000.0)

diff --git a/core/src/limits.rs b/core/src/limits.rs
@@ -58,7 +58,7 @@ impl ExecutionLimit {
         Self {
             current_oplimit: Some(0),
             max_ops_per_check: Some(0),
-            time_limit: Duration::from_secs(0),
+            time_limit: Duration::from_secs(0.0),
         }
     }
 
@@ -80,7 +80,7 @@ impl ExecutionLimit {
             *oplimit = oplimit.saturating_sub(ops);
 
             if *oplimit == 0 {
-                if context.update_start.elapsed() >= self.time_limit {
+                if context.update_start.elapsed().as_nanos() as f64 >= self.time_limit.as_nanos() {
                     return true;
                 }
 

diff --git a/core/src/loader.rs b/core/src/loader.rs
@@ -1417,7 +1417,10 @@ impl<'gc> Loader<'gc> {
                     Loader::preload_tick(
                         handle,
                         uc,
-                        &mut ExecutionLimit::with_max_ops_and_time(10000, Duration::from_millis(1)),
+                        &mut ExecutionLimit::with_max_ops_and_time(
+                            10000,
+                            Duration::from_millis(1.0),
+                        ),
                     )?;
 
                     return Ok(());

diff --git a/core/src/player.rs b/core/src/player.rs
@@ -1408,7 +1408,7 @@ impl Player {
     }
 
     pub fn run_frame(&mut self) {
-        let frame_time = std::time::Duration::from_nanos((750_000_000.0 / self.frame_rate) as u64);
+        let frame_time = Duration::from_nanos(750_000_000.0 / self.frame_rate);
         let (mut execution_limit, may_execute_while_streaming) = match self.load_behavior {
             LoadBehavior::Streaming => (
                 ExecutionLimit::with_max_ops_and_time(10000, frame_time),