Merge master.

diff --git a/src/lib/player.cc b/src/lib/player.cc
index f83e4ed26b7368228db0cad5e476d27c05a1ab7b..f07bf4980d569e832602a06458f40853f9dd8114 100644 (file)
--- 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 c3aea2b0faab8032ffcf092a773471285cf55537..b6a2d031857ad2e9f644ebfa06b5479dcc743989 100644 (file)
--- 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 44745006c3409297edf2f9a9296a14b8bb3581ea..a0aedaf47db04cebced346945cf152266672e2b9 100644 (file)
--- 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);
        }