X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent_factory.cc;h=0e8b04eda21c48b9b22f975a2e7e4b126485a417;hp=8aa432b0929b34c656a6c2113755cc14b1becdba;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=32c25edb97465c3b159fe8eed582596ffa7e8ee5 diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index 8aa432b09..0e8b04eda 100644 --- 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" @@ -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 @@ -47,17 +48,14 @@ using std::list; using boost::shared_ptr; using boost::optional; -#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); - /** Create a Content object from an XML node. - * @param film Film that the content will be in. * @param node XML description. * @param version XML state version. * @param notes A list to which is added descriptions of any non-critial warnings / messages. * @return Content object, or 0 if no content was recognised in the XML. */ shared_ptr -content_factory (shared_ptr film, cxml::NodePtr node, int version, list& notes) +content_factory (cxml::ConstNodePtr node, int version, list& notes) { string const type = node->string_child ("Type"); @@ -67,14 +65,14 @@ content_factory (shared_ptr film, cxml::NodePtr node, int version, l /* SndfileContent is now handled by the FFmpeg code rather than by separate libsndfile-based code. */ - content.reset (new FFmpegContent (film, node, version, notes)); + content.reset (new FFmpegContent (node, version, notes)); } else if (type == "Image") { - content.reset (new ImageContent (film, node, version)); + content.reset (new ImageContent (node, version)); } else if (type == "Sndfile") { /* SndfileContent is now handled by the FFmpeg code rather than by separate libsndfile-based code. */ - content.reset (new FFmpegContent (film, node, version, notes)); + content.reset (new FFmpegContent (node, version, notes)); content->audio->set_stream ( AudioStreamPtr ( @@ -88,47 +86,26 @@ content_factory (shared_ptr film, cxml::NodePtr node, int version, l ); } else if (type == "SubRip" || type == "TextSubtitle") { - content.reset (new TextSubtitleContent (film, node, version)); + content.reset (new StringTextFileContent (node, version)); } else if (type == "DCP") { - content.reset (new DCPContent (film, node, version)); + content.reset (new DCPContent (node, version)); } else if (type == "DCPSubtitle") { - content.reset (new DCPSubtitleContent (film, node, version)); + content.reset (new DCPSubtitleContent (node, version)); } else if (type == "VideoMXF") { - content.reset (new VideoMXFContent (film, node, version)); + content.reset (new VideoMXFContent (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); + content.reset (new AtmosMXFContent (node, version)); } return content; } /** Create some Content objects from a file or directory. - * @param film Film that the content will be in. * @param path File or directory. * @return Content objects. */ list > -content_factory (shared_ptr film, boost::filesystem::path path) +content_factory (boost::filesystem::path path) { list > content; @@ -173,10 +150,10 @@ content_factory (shared_ptr film, boost::filesystem::path path) } if (image_files > 0 && sound_files == 0) { - content.push_back (shared_ptr (new ImageContent (film, path))); + content.push_back (shared_ptr (new ImageContent(path))); } 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 (new FFmpegContent (film, i->path()))); + content.push_back (shared_ptr (new FFmpegContent(i->path()))); } } @@ -188,26 +165,26 @@ content_factory (shared_ptr film, boost::filesystem::path path) transform (ext.begin(), ext.end(), ext.begin(), ::tolower); 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 ImageContent(path)); + } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass" || ext == ".stl") { + single.reset (new StringTextFileContent(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)); + single.reset (new DCPSubtitleContent(path)); } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) { - single.reset (new DCPSubtitleContent (film, path)); + single.reset (new DCPSubtitleContent(path)); } else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) { - single.reset (new VideoMXFContent (film, path)); + single.reset (new VideoMXFContent(path)); } else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) { - single.reset (new AtmosMXFContent (film, path)); + single.reset (new AtmosMXFContent(path)); } if (!single) { - single.reset (new FFmpegContent (film, path)); + single.reset (new FFmpegContent(path)); } content.push_back (single);