Build fixes.

9 files changed, 9 insertions, 13 deletions

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 59d046956..3859915f8 100644
--- 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 b33a37cb8..a03300a6b 100644
--- 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 ebd9f8c72..a82c6c221 100644
--- 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 36e04120e..1b985a918 100644
--- 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 235a1a1d6..ccc59e064 100644
--- 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 73b9ad615..6cedf9179 100644
--- 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 e0c52e2bf..22004bcb8 100644
--- 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 4ac5192f2..61176a7c6 100644
--- 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 3a7920bd7..b66f793e5 100644
--- 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')