X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fcontent_factory.cc;h=e912589fcb9e89e51603dde5ec666423cfbcf407;hb=7bc2134d658778e04f1756c255e604b4ab5a5831;hp=e5e73f890b8592e9ca6df33af21056f2830d8608;hpb=320c20b9538c985005dc850d685eecfc1a5edc98;p=dcpomatic.git diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index e5e73f890..e912589fc 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,81 +36,82 @@ #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 std::make_shared; +using std::shared_ptr; +using std::string; 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"); + 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.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 ( - 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.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) +list> +content_factory (boost::filesystem::path path) { - list > content; + list> content; if (boost::filesystem::is_directory (path)) { @@ -139,11 +142,11 @@ content_factory (shared_ptr film, boost::filesystem::path path) continue; } - if (valid_image_file (i->path ())) { + if (valid_image_file(i->path())) { ++image_files; } - if (valid_sound_file (i->path ())) { + if (valid_sound_file(i->path())) { ++sound_files; } @@ -151,10 +154,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 (make_shared(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()))); + for (auto i: boost::filesystem::directory_iterator(path)) { + content.push_back (make_shared(i.path())); } } @@ -162,30 +165,30 @@ content_factory (shared_ptr film, boost::filesystem::path path) shared_ptr single; - string ext = path.extension().string (); + auto ext = path.extension().string(); 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)); - } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) { - single.reset (new DCPSubtitleContent (film, path)); - } else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) { - single.reset (new VideoMXFContent (film, path)); - } else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) { - single.reset (new AtmosMXFContent (film, path)); + single.reset (new DCPSubtitleContent(path)); + } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf(path)) { + single.reset (new DCPSubtitleContent(path)); + } else if (ext == ".mxf" && VideoMXFContent::valid_mxf(path)) { + single.reset (new VideoMXFContent(path)); + } else if (ext == ".mxf" && AtmosMXFContent::valid_mxf(path)) { + single.reset (new AtmosMXFContent(path)); } if (!single) { - single.reset (new FFmpegContent (film, path)); + single.reset (new FFmpegContent(path)); } content.push_back (single);