X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent_factory.cc;h=167b3f4e929cbceffe29507ebaed609d0d5af5e7;hp=87f4e36a0402ddae1f2d0c3928fbaebce9924ae8;hb=507a389e9c5f84ec1d51e7566e38fbf42f658537;hpb=14247790278d45e98004ef54b8ba700d10f3193a

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 87f4e36a0..167b3f4e9 100644
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -26,9 +26,9 @@
 #include "audio_content.h"
 #include "image_content.h"
 #include "atmos_mxf_content.h"
-#include "text_subtitle_content.h"
+#include "plain_text_file_content.h"
 #include "dcp_content.h"
-#include "dcp_subtitle_content.h"
+#include "dcp_text_content.h"
 #include "util.h"
 #include "ffmpeg_audio_stream.h"
 #include "video_mxf_content.h"
@@ -40,6 +40,8 @@
 #include <dcp/smpte_subtitle_asset.h>
 #include <boost/algorithm/string.hpp>
 
+#include "i18n.h"
+
 using std::string;
 using std::list;
 using boost::shared_ptr;
@@ -86,17 +88,57 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l
 			);
 
 	} else if (type == "SubRip" || type == "TextSubtitle") {
-		content.reset (new TextSubtitleContent (film, node, version));
+		content.reset (new PlainTextFileContent (film, node, version));
 	} else if (type == "DCP") {
 		content.reset (new DCPContent (film, node, version));
 	} else if (type == "DCPSubtitle") {
-		content.reset (new DCPSubtitleContent (film, node, version));
+		content.reset (new DCPTextContent (film, node, version));
 	} else if (type == "VideoMXF") {
 		content.reset (new VideoMXFContent (film, node, version));
 	} else if (type == "AtmosMXF") {
 		content.reset (new AtmosMXFContent (film, node, version));
 	}
 
+	/* See if this content should be nudged to start on a video frame */
+	DCPTime const old_pos = content->position();
+	content->set_position(old_pos);
+	if (old_pos != content->position()) {
+		string note = _("Your project contains video content that was not aligned to a frame boundary.");
+		note += "  ";
+		if (old_pos < content->position()) {
+			note += String::compose(
+				_("The file %1 has been moved %2 milliseconds later."),
+				content->path_summary(), DCPTime(content->position() - old_pos).seconds() * 1000
+				);
+		} else {
+			note += String::compose(
+				_("The file %1 has been moved %2 milliseconds earlier."),
+				content->path_summary(), DCPTime(content->position() - old_pos).seconds() * 1000
+				);
+		}
+		notes.push_back (note);
+	}
+
+	/* ...or have a start trim which is an integer number of frames */
+	ContentTime const old_trim = content->trim_start();
+	content->set_trim_start(old_trim);
+	if (old_trim != content->trim_start()) {
+		string note = _("Your project contains video content whose trim was not aligned to a frame boundary.");
+		note += "  ";
+		if (old_trim < content->trim_start()) {
+			note += String::compose(
+				_("The file %1 has been trimmed by %2 milliseconds more."),
+				content->path_summary(), ContentTime(content->trim_start() - old_trim).seconds() * 1000
+				);
+		} else {
+			note += String::compose(
+				_("The file %1 has been trimmed by %2 milliseconds less."),
+				content->path_summary(), ContentTime(old_trim - content->trim_start()).seconds() * 1000
+				);
+		}
+		notes.push_back (note);
+	}
+
 	return content;
 }
 
@@ -168,11 +210,16 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
 		if (valid_image_file (path)) {
 			single.reset (new ImageContent (film, path));
 		} else if (ext == ".srt" || ext == ".ssa" || ext == ".ass") {
-			single.reset (new TextSubtitleContent (film, path));
+			single.reset (new PlainTextFileContent (film, path));
 		} else if (ext == ".xml") {
-			single.reset (new DCPSubtitleContent (film, path));
+			cxml::Document doc;
+			doc.read_file (path);
+			if (doc.root_name() == "DCinemaSecurityMessage") {
+				throw KDMAsContentError ();
+			}
+			single.reset (new DCPTextContent (film, path));
 		} else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) {
-			single.reset (new DCPSubtitleContent (film, path));
+			single.reset (new DCPTextContent (film, path));
 		} else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) {
 			single.reset (new VideoMXFContent (film, path));
 		} else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) {