summaryrefslogtreecommitdiff
path: root/src/tools/dcpomatic_player.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-02-09 14:08:46 +0100
committerCarl Hetherington <cth@carlh.net>2021-02-09 14:08:46 +0100
commit7d33aff2d5e81185f3361e28c84e3f9858464ef1 (patch)
treeb77d2b066109ba4e6c4d36c80667499ba0b93214 /src/tools/dcpomatic_player.cc
parent09606d58511bddc4c1abe3f2dff1a8eaff13a991 (diff)
Coalesce player changes around CPL change.v2.15.127
If multiple player changes happen, causing the player to be suspended, there are problems if one of those changes causes a FilmViewer:seek. In there, we wait for the seek to finish, but it will never finish because of the suspension. Hence it's important that we only trigger the seek once the suspension is over. Fixes #1905.
Diffstat (limited to 'src/tools/dcpomatic_player.cc')
-rw-r--r--src/tools/dcpomatic_player.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 6e1104b66..527964953 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -717,8 +717,11 @@ private:
--id;
}
+ _viewer->set_coalesce_player_changes (true);
dcp->set_cpl ((*i)->id());
examine_content ();
+ _viewer->set_coalesce_player_changes (false);
+
_info->triggered_update ();
}