From ce94cd2d1e75738b53f7ab990a49e75a01b80394 Mon Sep 17 00:00:00 2001
From: in1tiate <radwoodward@vikings.grayson.edu>
Date: Wed, 11 Aug 2021 09:20:00 -0500
Subject: preload next frame before ticking over

---
 src/aolayer.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'src/aolayer.cpp')

diff --git a/src/aolayer.cpp b/src/aolayer.cpp
index 3791d66b..7ec42b96 100644
--- a/src/aolayer.cpp
+++ b/src/aolayer.cpp
@@ -532,7 +532,11 @@ void CharLayer::movie_ticker()
 void AOLayer::movie_ticker()
 {
   ++frame;
-  if (frame >= max_frames) {
+  QFuture<void> future;
+  if (frame >= movie_frames.size() && frame < max_frames) { // need to load the image
+      future = QtConcurrent::run(this, &AOLayer::load_next_frame);
+  }
+  else if (frame >= max_frames) {
     if (play_once) {
       if (cull_image)
         this->stop();
@@ -544,19 +548,21 @@ void AOLayer::movie_ticker()
     else
       frame = 0;
   }
-  //  qint64 difference = elapsed - movie_delays[frame];
-  if (frame >= movie_frames.size()) {
-    movie_frames.append(this->get_pixmap(m_reader.read()));
-    movie_delays.append(m_reader.nextImageDelay());
-  }
-
 #ifdef DEBUG_MOVIE
   qDebug() << frame << movie_delays[frame]
            << "actual time taken from last frame:" << actual_time.restart();
 #endif
-
+  future.waitForFinished(); // don't set the frame before we definitely have it in memory
   this->set_frame(movie_frames[frame]);
   ticker->setInterval(this->get_frame_delay(movie_delays[frame]));
+  if (frame + 1 >= movie_frames.size() && frame + 1 < max_frames) { // load the next frame before we tick again
+      future = QtConcurrent::run(this, &AOLayer::load_next_frame);
+  }
+}
+
+void AOLayer::load_next_frame() {
+    movie_frames.append(this->get_pixmap(m_reader.read()));
+    movie_delays.append(m_reader.nextImageDelay());
 }
 
 void CharLayer::preanim_done()
-- 
cgit 


From 51698ca6ac57361ca3a5d9aa7d3b3a67374f8b49 Mon Sep 17 00:00:00 2001
From: in1tiate <radwoodward@vikings.grayson.edu>
Date: Wed, 11 Aug 2021 09:28:59 -0500
Subject: debug_movie fixes

---
 src/aolayer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/aolayer.cpp')

diff --git a/src/aolayer.cpp b/src/aolayer.cpp
index 7ec42b96..075338b5 100644
--- a/src/aolayer.cpp
+++ b/src/aolayer.cpp
@@ -344,7 +344,7 @@ void AOLayer::start_playback(QString p_image)
   if (duration > 0 && cull_image == true)
     shfx_timer->start(duration);
 #ifdef DEBUG_MOVIE
-  qDebug() << max_frames << "Setting image to " << image_path
+  qDebug() << max_frames << "Setting image to " << p_image
            << "Time taken to process image:" << actual_time.elapsed();
 
   actual_time.restart();
@@ -548,11 +548,11 @@ void AOLayer::movie_ticker()
     else
       frame = 0;
   }
+  future.waitForFinished(); // don't set the frame before we definitely have it in memory
 #ifdef DEBUG_MOVIE
   qDebug() << frame << movie_delays[frame]
            << "actual time taken from last frame:" << actual_time.restart();
 #endif
-  future.waitForFinished(); // don't set the frame before we definitely have it in memory
   this->set_frame(movie_frames[frame]);
   ticker->setInterval(this->get_frame_delay(movie_delays[frame]));
   if (frame + 1 >= movie_frames.size() && frame + 1 < max_frames) { // load the next frame before we tick again
-- 
cgit 


From d84194871e50d86ba36d01029192ecf0b7665127 Mon Sep 17 00:00:00 2001
From: in1tiate <radwoodward@vikings.grayson.edu>
Date: Wed, 11 Aug 2021 09:38:05 -0500
Subject: comment out debug_movie

---
 src/aolayer.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/aolayer.cpp')

diff --git a/src/aolayer.cpp b/src/aolayer.cpp
index 075338b5..25873fee 100644
--- a/src/aolayer.cpp
+++ b/src/aolayer.cpp
@@ -320,10 +320,7 @@ void AOLayer::start_playback(QString p_image)
     for (int i = frame; i--;) {
       if (i <= -1)
         break;
-      QPixmap l_pixmap = this->get_pixmap(m_reader.read());
-      int l_delay = m_reader.nextImageDelay();
-      movie_frames.append(l_pixmap);
-      movie_delays.append(l_delay);
+      load_next_frame();
     }
   }
   last_path = p_image;
-- 
cgit 


From 2a18c1cdec54a324c6ba9834d6e6b05cc46f2535 Mon Sep 17 00:00:00 2001
From: in1tiate <radwoodward@vikings.grayson.edu>
Date: Wed, 11 Aug 2021 20:14:35 -0500
Subject: wait for thread to finish before starting new one

---
 src/aolayer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/aolayer.cpp')

diff --git a/src/aolayer.cpp b/src/aolayer.cpp
index 25873fee..99524947 100644
--- a/src/aolayer.cpp
+++ b/src/aolayer.cpp
@@ -529,8 +529,8 @@ void CharLayer::movie_ticker()
 void AOLayer::movie_ticker()
 {
   ++frame;
-  QFuture<void> future;
   if (frame >= movie_frames.size() && frame < max_frames) { // need to load the image
+      future.waitForFinished(); // Do Not want this to be running twice
       future = QtConcurrent::run(this, &AOLayer::load_next_frame);
   }
   else if (frame >= max_frames) {
-- 
cgit