X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent_factory.cc;h=f123061b75ea1e936d311a128c6a2c779e3fa3e0;hp=70a3dc7749b58197d1e5ac8d70b1d5a3383be047;hb=ad1ef39eda58b3a919ea3b7084401a0439409ec6;hpb=85bca8926d7d6e7f01f0e1f0dd08471053874bd2 diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index 70a3dc774..f123061b7 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,28 +34,28 @@ #include "video_mxf_content.h" #include "film.h" #include "log_entry.h" +#include "dcpomatic_log.h" #include "log.h" #include "compose.hpp" #include #include #include +#include "i18n.h" + using std::string; 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"); @@ -65,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 ( @@ -86,27 +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)); + 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; @@ -118,11 +117,8 @@ content_factory (shared_ptr 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 +138,6 @@ content_factory (shared_ptr 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,13 +149,11 @@ content_factory (shared_ptr film, boost::filesystem::path path) ++read; } - if (is_dcp) { - content.push_back (shared_ptr (new DCPContent (film, path))); - } else if (image_files > 0) { - content.push_back (shared_ptr (new ImageContent (film, path))); - } else { + if (image_files > 0 && sound_files == 0) { + 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()))); } } @@ -179,21 +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)); + single.reset (new ImageContent(path)); } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass") { - single.reset (new TextSubtitleContent (film, path)); + single.reset (new StringTextFileContent(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 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);