Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.

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

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 934677c664dd99e3e14917109b89f36d7f089d53..0e8b04eda21c48b9b22f975a2e7e4b126485a417 100644 (file)
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -34,6 +34,7 @@
 #include "video_mxf_content.h"
 #include "film.h"
 #include "log_entry.h"
+#include "dcpomatic_log.h"
 #include "log.h"
 #include "compose.hpp"
 #include <libcxml/cxml.h>
@@ -47,8 +48,6 @@ using std::list;
 using boost::shared_ptr;
 using boost::optional;
 
-#define LOG_GENERAL(...) dcpomatic_log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-
 /** Create a Content object from an XML node.
  *  @param node XML description.
  *  @param version XML state version.
@@ -56,7 +55,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::ConstNodePtr node, int version, list<string>& notes)
+content_factory (cxml::ConstNodePtr node, int version, list<string>& notes)
 {
        string const type = node->string_child ("Type");
 
@@ -98,46 +97,6 @@ content_factory (shared_ptr<const Film> film, cxml::ConstNodePtr node, int versi
                content.reset (new AtmosMXFContent (node, version));
        }
 
-       /* See if this content should be nudged to start on a video frame */
-       DCPTime const old_pos = content->position();
-       content->set_position(film, 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;
 }
 
@@ -207,7 +166,7 @@ content_factory (boost::filesystem::path path)
 
                if (valid_image_file (path)) {
                        single.reset (new ImageContent(path));
-               } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass") {
+               } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass" || ext == ".stl") {
                        single.reset (new StringTextFileContent(path));
                } else if (ext == ".xml") {
                        cxml::Document doc;