Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug_movie fixes

Browse Source
This commit is contained in:
in1tiate 2021-08-11 09:28:59 -05:00
parent ce94cd2d1e
commit 51698ca6ac
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Attorney_Online.pro
View File

@ -19,6 +19,8 @@ QMAKE_LFLAGS += -Wl,-rpath,"'\$$ORIGIN/lib'"
# Uncomment for verbose network logging # Uncomment for verbose network logging
# DEFINES += DEBUG_NETWORK # DEFINES += DEBUG_NETWORK
DEFINES += DEBUG_MOVIE
# Uncomment for building with debug symbols # Uncomment for building with debug symbols
# CONFIG += debug # CONFIG += debug

4
src/aolayer.cpp
View File

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