swaroop: windows build fix.

[dcpomatic.git] / src / lib / content_factory.cc

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 70a3dc7749b58197d1e5ac8d70b1d5a3383be047..10486b0c3948130a63081c24f63a49f13fc522f5 100644 (file)
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -26,7 +26,7 @@
 #include "audio_content.h"
 #include "image_content.h"
 #include "atmos_mxf_content.h"
-#include "text_subtitle_content.h"
+#include "string_text_file_content.h"
 #include "dcp_content.h"
 #include "dcp_subtitle_content.h"
 #include "util.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;
@@ -55,7 +57,7 @@ using boost::optional;
  *  @return Content object, or 0 if no content was recognised in the XML.
  */
 shared_ptr<Content>
-content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, list<string>& notes)
+content_factory (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, list<string>& notes)
 {
        string const type = node->string_child ("Type");
 
@@ -86,7 +88,7 @@ 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 StringTextFileContent (film, node, version));
        } else if (type == "DCP") {
                content.reset (new DCPContent (film, node, version));
        } else if (type == "DCPSubtitle") {
@@ -97,6 +99,46 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l
                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;
 }
 
@@ -118,11 +160,8 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
                        return content;
                }
 
-               /* Guess if this is a DCP, a set of images or a set of sound files: read the first ten filenames
-                  and if they are all valid image/sound files we assume it is not a DCP.
-               */
+               /* See if this is a set of images or a set of sound files */
 
-               bool is_dcp = false;
                int image_files = 0;
                int sound_files = 0;
                int read = 0;
@@ -142,14 +181,6 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
                                continue;
                        }
 
-                       if (!valid_image_file (i->path()) && !valid_sound_file (i->path())) {
-                               /* We have a normal file which isn't an image; assume we are looking
-                                  at a DCP.
-                               */
-                               LOG_GENERAL ("It's a DCP because of %1", i->path());
-                               is_dcp = true;
-                       }
-
                        if (valid_image_file (i->path ())) {
                                ++image_files;
                        }
@@ -161,11 +192,9 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
                        ++read;
                }
 
-               if (is_dcp) {
-                       content.push_back (shared_ptr<Content> (new DCPContent (film, path)));
-               } else if (image_files > 0) {
+               if (image_files > 0 && sound_files == 0)  {
                        content.push_back (shared_ptr<Content> (new ImageContent (film, path)));
-               } else {
+               } else if (image_files == 0 && sound_files > 0) {
                        for (boost::filesystem::directory_iterator i(path); i != boost::filesystem::directory_iterator(); ++i) {
                                content.push_back (shared_ptr<FFmpegContent> (new FFmpegContent (film, i->path())));
                        }
@@ -181,8 +210,13 @@ 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 StringTextFileContent (film, path));
                } else if (ext == ".xml") {
+                       cxml::Document doc;
+                       doc.read_file (path);
+                       if (doc.root_name() == "DCinemaSecurityMessage") {
+                               throw KDMAsContentError ();
+                       }
                        single.reset (new DCPSubtitleContent (film, path));
                } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) {
                        single.reset (new DCPSubtitleContent (film, path));