fix: added load_error event (#75)

* fix: added load_error event * fix: demo-player
LottieFiles · Feb 2, 2024 · 629719d · 629719d
1 parent a59223b
commit 629719d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/demo-player/src/main.rs b/demo-player/src/main.rs
@@ -31,6 +31,9 @@ impl Observer for DummyObserver2 {
     fn on_load(&self) {
         println!("on_load2");
     }
+    fn on_load_error(&self) {
+        println!("on_load_error2");
+    }
     fn on_loop(&self, loop_count: u32) {
         println!("on_loop2: {}", loop_count);
     }
@@ -62,6 +65,9 @@ impl Observer for DummyObserver {
     fn on_load(&self) {
         println!("on_load {} ", self.id);
     }
+    fn on_load_error(&self) {
+        println!("on_load_error {} ", self.id);
+    }
     fn on_loop(&self, loop_count: u32) {
         println!("on_loop {}: {}", self.id, loop_count);
     }

diff --git a/dotlottie-ffi/src/dotlottie_player.udl b/dotlottie-ffi/src/dotlottie_player.udl
@@ -4,6 +4,7 @@ namespace dotlottie_player {
 [Trait, WithForeign]
 interface Observer {
     void on_load();
+    void on_load_error();
     void on_play();
     void on_pause();
     void on_stop();

diff --git a/dotlottie-ffi/src/dotlottie_player_cpp.udl b/dotlottie-ffi/src/dotlottie_player_cpp.udl
@@ -4,6 +4,7 @@ namespace dotlottie_player {
 [Trait]
 interface Observer {
     void on_load();
+    void on_load_error();
     void on_play();
     void on_pause();
     void on_stop();

diff --git a/dotlottie-rs/src/dotlottie_player.rs b/dotlottie-rs/src/dotlottie_player.rs
@@ -7,6 +7,7 @@ use crate::lottie_renderer::{LottieRenderer, LottieRendererError};
 
 pub trait Observer: Send + Sync {
     fn on_load(&self);
+    fn on_load_error(&self);
     fn on_play(&self);
     fn on_pause(&self);
     fn on_stop(&self);
@@ -629,6 +630,12 @@ impl DotLottiePlayer {
             self.observers.read().unwrap().iter().for_each(|observer| {
                 observer.on_load();
             });
+        } else {
+            self.observers.read().unwrap().iter().for_each(|observer| {
+                observer.on_load_error();
+            });
+
+            return false;
         }
 
         is_ok
@@ -644,6 +651,12 @@ impl DotLottiePlayer {
             self.observers.read().unwrap().iter().for_each(|observer| {
                 observer.on_load();
             });
+        } else {
+            self.observers.read().unwrap().iter().for_each(|observer| {
+                observer.on_load_error();
+            });
+
+            return false;
         }
 
         is_ok
@@ -659,6 +672,12 @@ impl DotLottiePlayer {
             self.observers.read().unwrap().iter().for_each(|observer| {
                 observer.on_load();
             });
+        } else {
+            self.observers.read().unwrap().iter().for_each(|observer| {
+                observer.on_load_error();
+            });
+
+            return false;
         }
 
         is_ok
@@ -674,6 +693,12 @@ impl DotLottiePlayer {
             self.observers.read().unwrap().iter().for_each(|observer| {
                 observer.on_load();
             });
+        } else {
+            self.observers.read().unwrap().iter().for_each(|observer| {
+                observer.on_load_error();
+            });
+
+            return false;
         }
 
         is_ok