Coalesce player changes around CPL change.

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.

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 6e1104b66eba5767910eb8f7069a799100096ee2..52796495379974fa8bdc6d6ce089ce6216c1174f 100644 (file)
--- 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 ();
        }