aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Attorney_Online.pro2
-rw-r--r--src/aolayer.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/Attorney_Online.pro b/Attorney_Online.pro
index 2a5c1e14..2498232f 100644
--- a/Attorney_Online.pro
+++ b/Attorney_Online.pro
@@ -19,6 +19,8 @@ QMAKE_LFLAGS += -Wl,-rpath,"'\$$ORIGIN/lib'"
# Uncomment for verbose network logging
# DEFINES += DEBUG_NETWORK
+DEFINES += DEBUG_MOVIE
+
# Uncomment for building with debug symbols
# CONFIG += debug
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