X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=10e798ed510644a86e03d11249d737139268d3b0;hp=8d55ffb2e2e5cf51db512f3bf90aacd1f64583e8;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hpb=4ab86ef0295bcd6bb9297996a06006f371d22bae diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 8d55ffb2e..10e798ed5 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -211,9 +211,9 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const } void -PlayerVideo::send_binary (shared_ptr socket) const +PlayerVideo::write_to_socket (shared_ptr socket) const { - _in->send_binary (socket); + _in->write_to_socket (socket); if (_text) { _text->image->write_to_socket (socket); } @@ -339,7 +339,7 @@ PlayerVideo::reset_metadata (shared_ptr film, dcp::Size video_contai _crop = content->video->crop(); _fade = content->video->fade(film, _video_frame.get()); - _inter_size = content->video->scale().size(content->video, video_container_size, film_frame_size); + _inter_size = scale_for_display(content->video->scaled_size(film_frame_size), video_container_size, film_frame_size); _out_size = video_container_size; _colour_conversion = content->video->colour_conversion(); _video_range = content->video->range();