From: Carl Hetherington Date: Sat, 10 Sep 2022 17:13:58 +0000 (+0200) Subject: It's now safe to get _video_container_size without the lock. X-Git-Tag: v2.16.25~1^2~2 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=6e168c52f2165c026c149581e2dfe3b2cd5c5298 It's now safe to get _video_container_size without the lock. --- diff --git a/src/lib/player.cc b/src/lib/player.cc index 13cd8f11b..b3f11c800 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -307,10 +307,9 @@ Player::playlist_content_change (ChangeType type, int property, bool frequent) { if (property == VideoContentProperty::CROP) { if (type == ChangeType::DONE) { - auto const vcs = video_container_size(); boost::mutex::scoped_lock lm (_mutex); for (auto const& i: _delay) { - i.first->reset_metadata (_film, vcs); + i.first->reset_metadata(_film, _video_container_size); } } } else {