Merge branch '1.0' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic into 1.0

6 files changed, 25 insertions, 6 deletions

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 901cb53cf..24378ed3d 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -166,7 +166,8 @@ FFmpegContent::examine (shared_ptr<Job> job)
 string
 FFmpegContent::summary () const
 {
-	return String::compose (_("%1 [movie]"), path());
+	/* Get the string() here so that the name does not have quotes around it */
+	return String::compose (_("%1 [movie]"), path().filename().string());
 }
 
 string
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 713b80dcb..2ca00cf6d 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -55,6 +55,7 @@ SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml:
 string
 SndfileContent::summary () const
 {
+	/* Get the string() here so that the name does not have quotes around it */
 	return String::compose (_("%1 [audio]"), path().filename().string());
 }
 
diff --git a/src/lib/still_image_content.cc b/src/lib/still_image_content.cc
index e829e205d..d0600f52e 100644
--- a/src/lib/still_image_content.cc
+++ b/src/lib/still_image_content.cc
@@ -48,7 +48,8 @@ StillImageContent::StillImageContent (shared_ptr<const Film> f, shared_ptr<const
 string
 StillImageContent::summary () const
 {
-	return String::compose (_("%1 [still]"), path());
+	/* Get the string() here so that the name does not have quotes around it */
+	return String::compose (_("%1 [still]"), path().filename().string());
 }
 
 string
diff --git a/src/lib/util.cc b/src/lib/util.cc
index affbe3b00..183ff7d8b 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -742,17 +742,17 @@ FrameRateConversion::FrameRateConversion (float source, int dcp)
 	change_speed = !about_equal (source * factor(), dcp);
 
 	if (!skip && !repeat && !change_speed) {
-		description = _("DCP and source have the same rate.\n");
+		description = _("Content and DCP have the same rate.\n");
 	} else {
 		if (skip) {
-			description = _("DCP will use every other frame of the source.\n");
+			description = _("DCP will use every other frame of the content.\n");
 		} else if (repeat) {
-			description = _("Each source frame will be doubled in the DCP.\n");
+			description = _("Each content frame will be doubled in the DCP.\n");
 		}
 
 		if (change_speed) {
 			float const pc = dcp * 100 / (source * factor());
-			description += String::compose (_("DCP will run at %1%% of the source speed.\n"), pc);
+			description += String::compose (_("DCP will run at %1%% of the content speed.\n"), pc);
 		}
 	}
 }
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index d70ece340..f61518ec0 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -243,3 +243,17 @@ VideoContent::technical_summary () const
 {
 	return String::compose ("video: length %1, size %2x%3, rate %4", video_length(), video_size().width, video_size().height, video_frame_rate());
 }
+
+libdcp::Size
+VideoContent::video_size_after_3d_split () const
+{
+	libdcp::Size const s = video_size ();
+	switch (video_frame_type ()) {
+	case VIDEO_FRAME_TYPE_2D:
+		return s;
+	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+		return libdcp::Size (s.width / 2, s.height);
+	}
+
+	assert (false);
+}
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 513e1f598..97ef6a9fa 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -88,6 +88,8 @@ public:
 		return _ratio;
 	}
 
+	libdcp::Size video_size_after_3d_split () const;
+
 protected:
 	void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);