X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent_factory.cc;h=135f3fe5f5bb1da82dfbdfb16b908475b18b16f6;hp=d3905e4e7c443a2d0c59bb06947f57b669c09f46;hb=182b9d2e2feb6545592868606aaf0f0146095481;hpb=a98eb60029247836d3dec5cb1539d9cb9a67d0eb diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index d3905e4e7..135f3fe5f 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -18,15 +18,17 @@ */ + /** @file src/lib/content_factory.cc * @brief Methods to create content objects. */ + #include "ffmpeg_content.h" #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,95 +36,92 @@ #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 -using std::string; +#include "i18n.h" + + using std::list; -using boost::shared_ptr; -using boost::optional; +using std::make_shared; +using std::shared_ptr; +using std::string; +using std::vector; -#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"); + auto const type = node->string_child ("Type"); - boost::shared_ptr content; + std::shared_ptr content; if (type == "FFmpeg") { - /* SndfileContent is now handled by the FFmpeg code rather than by - separate libsndfile-based code. - */ - content.reset (new FFmpegContent (film, node, version, notes)); + content = make_shared(node, version, notes); } else if (type == "Image") { - content.reset (new ImageContent (film, node, version)); + content = make_shared(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 = make_shared(node, version, notes); content->audio->set_stream ( - AudioStreamPtr ( - new FFmpegAudioStream ( - "Stream", 0, - node->number_child ("AudioFrameRate"), - node->number_child ("AudioLength"), - AudioMapping (node->node_child ("AudioMapping"), version) - ) + make_shared( + "Stream", 0, + node->number_child ("AudioFrameRate"), + node->number_child ("AudioLength"), + AudioMapping (node->node_child ("AudioMapping"), version) ) ); } else if (type == "SubRip" || type == "TextSubtitle") { - content.reset (new TextSubtitleContent (film, node, version)); + content = make_shared(node, version, notes); } else if (type == "DCP") { - content.reset (new DCPContent (film, node, version)); + content = make_shared(node, version); } else if (type == "DCPSubtitle") { - content.reset (new DCPSubtitleContent (film, node, version)); + content = make_shared(node, version); } else if (type == "VideoMXF") { - content.reset (new VideoMXFContent (film, node, version)); + content = make_shared(node, version); } else if (type == "AtmosMXF") { - content.reset (new AtmosMXFContent (film, node, version)); + content = make_shared(node, version); } return content; } -/** Create a Content object from a file or directory. - * @param film Film that the content will be in. + +/** Create some Content objects from a file or directory. * @param path File or directory. - * @return Content object. + * @return Content objects. */ -shared_ptr -content_factory (shared_ptr film, boost::filesystem::path path) +vector> +content_factory (boost::filesystem::path path) { - shared_ptr content; + vector> content; if (boost::filesystem::is_directory (path)) { LOG_GENERAL ("Look in directory %1", path); if (boost::filesystem::is_empty (path)) { - return shared_ptr (); + return content; } - /* Guess if this is a DCP or a set of images: read the first ten filenames and if they - are all valid image files we assume it is a set of images. - */ + /* 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; for (boost::filesystem::directory_iterator i(path); i != boost::filesystem::directory_iterator() && read < 10; ++i) { @@ -140,45 +139,56 @@ content_factory (shared_ptr film, boost::filesystem::path path) continue; } - if (!valid_image_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; + } + + if (valid_sound_file(i->path())) { + ++sound_files; } ++read; } - if (is_dcp) { - content.reset (new DCPContent (film, path)); - } else { - content.reset (new ImageContent (film, path)); + if (image_files > 0 && sound_files == 0) { + content.push_back (make_shared(path)); + } else if (image_files == 0 && sound_files > 0) { + for (auto i: boost::filesystem::directory_iterator(path)) { + content.push_back (make_shared(i.path())); + } } } else { - string ext = path.extension().string (); + shared_ptr single; + + auto ext = path.extension().string(); transform (ext.begin(), ext.end(), ext.begin(), ::tolower); if (valid_image_file (path)) { - content.reset (new ImageContent (film, path)); - } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass") { - content.reset (new TextSubtitleContent (film, path)); + single = make_shared(path); + } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass" || ext == ".stl") { + single = make_shared(path); } else if (ext == ".xml") { - content.reset (new DCPSubtitleContent (film, path)); - } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) { - content.reset (new DCPSubtitleContent (film, path)); - } else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) { - content.reset (new VideoMXFContent (film, path)); - } else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) { - content.reset (new AtmosMXFContent (film, path)); + cxml::Document doc; + doc.read_file (path); + if (doc.root_name() == "DCinemaSecurityMessage") { + throw KDMAsContentError (); + } + single = make_shared(path); + } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf(path)) { + single = make_shared(path); + } else if (ext == ".mxf" && VideoMXFContent::valid_mxf(path)) { + single = make_shared(path); + } else if (ext == ".mxf" && AtmosMXFContent::valid_mxf(path)) { + single = make_shared(path); } - if (!content) { - content.reset (new FFmpegContent (film, path)); + if (!single) { + single = make_shared(path); } + + content.push_back (single); } return content;