Mostly-merge master.

[dcpomatic.git] / src / lib / player.cc

diff --git a/src/lib/player.cc b/src/lib/player.cc
index e89e84aa6488179a1caf20f600a0d7b8e640f061..f07bf4980d569e832602a06458f40853f9dd8114 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -81,7 +81,7 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
        _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
        _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3));
        _film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1));
-       set_video_container_size (fit_ratio_within (_film->container()->ratio (), _film->full_frame ()));
+       set_video_container_size (_film->frame_size ());
 }
 
 void
@@ -273,7 +273,7 @@ Player::emit_video (weak_ptr<Piece> weak_piece, shared_ptr<DecodedVideo> video)
 
        FrameRateChange frc (content->video_frame_rate(), _film->video_frame_rate());
 
-       dcp::Size image_size = content->scale().size (content, _video_container_size);
+       dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size ());
        if (_approximate_size) {
                image_size.width &= ~3;
                image_size.height &= ~3;