Build fixes.

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 59d046956d570d237870308246dd4bbbb4d336bf..3859915f87520cb69beb9d21d84f2355b8b83919 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -275,7 +275,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 const image_size = content->scale().size (content, _video_container_size);
+       dcp::Size image_size = content->scale().size (content, _video_container_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 b33a37cb8ce385892d3b2aac663e05857e46cc1d..a03300a6b2310b0a06bfc50153bb2ec56646b796 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -436,8 +436,8 @@ VideoContentScale::name () const
        return _("No scale");
 }
 
-libdcp::Size
-VideoContentScale::size (shared_ptr<const VideoContent> c, libdcp::Size container) const
+dcp::Size
+VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size container) const
 {
        if (_ratio) {
                return fit_ratio_within (_ratio->ratio (), container);

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index ebd9f8c72de7b73777b84e5f8b114f4e6f5bb104..a82c6c22131a339229c55d078942677d57718465 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -45,7 +45,7 @@ public:
        VideoContentScale (bool);
        VideoContentScale (boost::shared_ptr<cxml::Node>);
 
-       libdcp::Size size (boost::shared_ptr<const VideoContent>, libdcp::Size) const;
+       dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size) const;
        std::string id () const;
        std::string name () const;
        void as_xml (xmlpp::Node *) const;

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 36e04120e306732ea54bba4ce68acd16d0af5300..1b985a918e752dc7d94264f026ce8f37ccda05ba 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -190,7 +190,7 @@ main (int argc, char* argv[])
                for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
                        shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (*i);
                        if (ic) {
-                               ic->set_video_length (still_length * 24);
+                               ic->set_video_length (ContentTime::from_seconds (still_length));
                        }
                }
 

diff --git a/test/ffmpeg_seek_test.cc b/test/ffmpeg_seek_test.cc
index 235a1a1d67d245e064fea9291f266b32a73e901c..ccc59e0642c7a10bbf2af85b483c5d0065e3e85b 100644 (file)
--- a/test/ffmpeg_seek_test.cc
+++ b/test/ffmpeg_seek_test.cc
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_seek_test)
        film->set_name ("ffmpeg_seek_test");
        film->set_container (Ratio::from_id ("185"));
        shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/staircase.mov"));
-       c->set_ratio (Ratio::from_id ("185"));
+       c->set_scale (VideoContentScale (Ratio::from_id ("185")));
        film->examine_and_add_content (c);
 
        wait_for_jobs ();

diff --git a/test/repeat_frame_test.cc b/test/repeat_frame_test.cc
index 73b9ad615519d2a72fbfd9e934c1d2bd2b9d544a..6cedf91795e8d7196d6f2b8b365fc7e7a4a5aa91 100644 (file)
--- a/test/repeat_frame_test.cc
+++ b/test/repeat_frame_test.cc
@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE (repeat_frame_test)
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
        shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/red_24.mp4"));
-       c->set_ratio (Ratio::from_id ("185"));
+       c->set_scale (VideoContentScale (Ratio::from_id ("185")));
        film->examine_and_add_content (c);
 
        wait_for_jobs ();

diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index e0c52e2bf492a9357d5e7d15118d4f3309b416f8..22004bcb8c876a2ea37f09b8af688f476f2fbafe 100644 (file)
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
        shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
-       content->set_ratio (Ratio::from_id ("185"));
+       content->set_scale (VideoContentScale (Ratio::from_id ("185")));
        film->examine_and_add_content (content);
        wait_for_jobs ();
 

diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index 4ac5192f23284d375353adb6c6487cbd4fa02504..61176a7c62a2dc34a0ffb02f1342a2b23b620619 100644 (file)
--- a/test/skip_frame_test.cc
+++ b/test/skip_frame_test.cc
@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE (skip_frame_test)
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
        shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
-       c->set_ratio (Ratio::from_id ("185"));
+       c->set_scale (VideoContentScale (Ratio::from_id ("185")));
        film->examine_and_add_content (c);
 
        wait_for_jobs ();

diff --git a/wscript b/wscript
index 3a7920bd7989585f3508056e7073f09dd41c76e5..b66f793e53f140f57ace170b64281f8cf12d3183 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,11 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-<<<<<<< HEAD
 VERSION = '2.0.0devel'
-=======
-VERSION = '1.64.18devel'
->>>>>>> master
 
 def options(opt):
     opt.load('compiler_cxx')