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

if its the same file, dont interrupt playback

Browse Source
This commit is contained in:
in1tiate 2021-02-13 07:36:57 -06:00
parent fe00c6b7de
commit 8163071d90
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/aolayer.cpp
View File

@ -261,6 +261,15 @@ void CharLayer::start_playback(QString p_image)
void AOLayer::start_playback(QString p_image) void AOLayer::start_playback(QString p_image)
{ {
if (!ao_app->is_continuous_enabled()) {
continuous = false;
force_continuous = true;
}
if ((last_path == p_image) && (!force_continuous))
return;
#ifdef DEBUG_MOVIE #ifdef DEBUG_MOVIE
actual_time.restart(); actual_time.restart();
#endif #endif
@ -268,12 +277,6 @@ void AOLayer::start_playback(QString p_image)
freeze(); freeze();
movie_frames.clear(); movie_frames.clear();
movie_delays.clear(); movie_delays.clear();
if (!ao_app->is_continuous_enabled()) {
continuous = false;
force_continuous = true;
}
QString scaling_override = QString scaling_override =
ao_app->read_design_ini("scaling", p_image + ".ini"); ao_app->read_design_ini("scaling", p_image + ".ini");
if (scaling_override != "") if (scaling_override != "")
@ -289,10 +292,6 @@ void AOLayer::start_playback(QString p_image)
m_reader.setFileName(p_image); m_reader.setFileName(p_image);
if (m_reader.loopCount() == 0) if (m_reader.loopCount() == 0)
play_once = true; play_once = true;
if ((last_path == p_image) && (!force_continuous))
continuous = true;
else if ((last_path != p_image) && !force_continuous)
continuous = false;
if (!continuous) if (!continuous)
frame = 0; frame = 0;
last_max_frames = max_frames; last_max_frames = max_frames;