diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-08-20 12:00:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-08-20 12:00:53 +0100 |
| commit | 2c0d0c5230addee44dc2cebd08d4f832550a3d6c (patch) | |
| tree | 840853863b1999c448c78c16d4b9c5e48bf17225 /src | |
| parent | d44428eeda4c15bcd7c051681292c4dca2696e09 (diff) | |
MIssing PENDING/CANCELLED for VIDEO_CONTAINER_SIZE. Fix 3D fill with 2D sources.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/player.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index dae0d23d6..ce6912f0b 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -242,10 +242,14 @@ Player::playlist_content_change (ChangeType type, int property, bool frequent) void Player::set_video_container_size (dcp::Size s) { + Change (CHANGE_TYPE_PENDING, PlayerProperty::VIDEO_CONTAINER_SIZE, false); + { boost::mutex::scoped_lock lm (_mutex); if (s == _video_container_size) { + lm.unlock (); + Change (CHANGE_TYPE_CANCELLED, PlayerProperty::VIDEO_CONTAINER_SIZE, false); return; } @@ -755,6 +759,9 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video) LastVideoMap::const_iterator last = _last_video.find (wp); if (_film->three_d()) { Eyes fill_to_eyes = video.eyes; + if (fill_to_eyes == EYES_BOTH) { + fill_to_eyes = EYES_LEFT; + } if (fill_to == piece->content->end()) { /* Don't fill after the end of the content */ fill_to_eyes = EYES_LEFT; |