diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-17 00:55:53 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-17 00:55:53 +0000 |
| commit | a6b7ff4fc0ad2d05a7b9a9c56c0e0ec60ec44a4c (patch) | |
| tree | 6a79eb71f337ade25e90cdf40b9b3f93bb2724a8 /src | |
| parent | 2e504b33eb9f38cac629ad31b7c107fb0cf5efda (diff) | |
Merge master.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/player.cc | 2 | ||||
| -rw-r--r-- | src/lib/video_content.cc | 4 | ||||
| -rw-r--r-- | src/wx/config_dialog.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index f83e4ed26..f07bf4980 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -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; diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index c3aea2b0f..b6a2d0318 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -452,7 +452,7 @@ VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_con return fit_ratio_within (_ratio->ratio (), display_container); } - libdcp::Size const ac = c->video_size_after_crop (); + dcp::Size const ac = c->video_size_after_crop (); /* Force scale if the film_container is smaller than the content's image */ if (_scale || film_container.width < ac.width || film_container.height < ac.height) { @@ -462,7 +462,7 @@ VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_con /* Scale the image so that it will be in the right place in film_container, even if display_container is a different size. */ - return libdcp::Size ( + return dcp::Size ( c->video_size().width * float(display_container.width) / film_container.width, c->video_size().height * float(display_container.height) / film_container.height ); diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 44745006c..a0aedaf47 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -440,14 +440,14 @@ private: void issuer_changed () { - libdcp::XMLMetadata m = Config::instance()->dcp_metadata (); + dcp::XMLMetadata m = Config::instance()->dcp_metadata (); m.issuer = wx_to_std (_issuer->GetValue ()); Config::instance()->set_dcp_metadata (m); } void creator_changed () { - libdcp::XMLMetadata m = Config::instance()->dcp_metadata (); + dcp::XMLMetadata m = Config::instance()->dcp_metadata (); m.creator = wx_to_std (_creator->GetValue ()); Config::instance()->set_dcp_metadata (m); } |