X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=99aece8d660d5c67c1140410868b6bdd32d3b9f5;hb=3753cb8685e1755b067676345a5871db24149d0f;hp=59db923be79503d4425122f24c320690e3d961ed;hpb=f0738a22fc7555c306d49bcd1c356ce210e2c0e2;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index 59db923be..99aece8d6 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -273,8 +273,7 @@ Player::process_video (weak_ptr weak_piece, shared_ptr image } Time const time = content->position() + relative_time + extra - content->trim_start (); - float const ratio = content->ratio() ? content->ratio()->ratio() : content->video_size_after_crop().ratio(); - libdcp::Size const image_size = fit_ratio_within (ratio, _video_container_size); + libdcp::Size const image_size = content->scale().size (content, _video_container_size); shared_ptr pi ( new PlayerImage ( @@ -537,7 +536,7 @@ Player::content_changed (weak_ptr w, int property, bool frequent) Changed (frequent); } else if ( - property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_RATIO || + property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_SCALE || property == VideoContentProperty::VIDEO_FRAME_RATE ) {