X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_factory.cc;h=e912589fcb9e89e51603dde5ec666423cfbcf407;hb=b0d658e5c5b953b38e341a90518b5e7b2108811a;hp=934677c664dd99e3e14917109b89f36d7f089d53;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index 934677c66..e912589fc 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -18,10 +18,12 @@ */ + /** @file src/lib/content_factory.cc * @brief Methods to create content objects. */ + #include "ffmpeg_content.h" #include "audio_content.h" #include "image_content.h" @@ -34,6 +36,7 @@ #include "video_mxf_content.h" #include "film.h" #include "log_entry.h" +#include "dcpomatic_log.h" #include "log.h" #include "compose.hpp" #include @@ -42,12 +45,13 @@ #include "i18n.h" -using std::string; + using std::list; -using boost::shared_ptr; +using std::make_shared; +using std::shared_ptr; +using std::string; 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. @@ -56,99 +60,58 @@ using boost::optional; * @return Content object, or 0 if no content was recognised in the XML. */ shared_ptr -content_factory (shared_ptr film, cxml::ConstNodePtr 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 (node, version, notes)); + content.reset (new FFmpegContent(node, version, notes)); } else if (type == "Image") { - content.reset (new ImageContent (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 (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 StringTextFileContent (node, version)); + content.reset (new StringTextFileContent(node, version)); } else if (type == "DCP") { - content.reset (new DCPContent (node, version)); + content.reset (new DCPContent(node, version)); } else if (type == "DCPSubtitle") { - content.reset (new DCPSubtitleContent (node, version)); + content.reset (new DCPSubtitleContent(node, version)); } else if (type == "VideoMXF") { - content.reset (new VideoMXFContent (node, version)); + content.reset (new VideoMXFContent(node, version)); } else if (type == "AtmosMXF") { - 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); + content.reset (new AtmosMXFContent(node, version)); } return content; } + /** Create some Content objects from a file or directory. * @param path File or directory. * @return Content objects. */ -list > +list> content_factory (boost::filesystem::path path) { - list > content; + list> content; if (boost::filesystem::is_directory (path)) { @@ -179,11 +142,11 @@ content_factory (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; } @@ -191,10 +154,10 @@ content_factory (boost::filesystem::path path) } if (image_files > 0 && sound_files == 0) { - content.push_back (shared_ptr (new ImageContent(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(i->path()))); + for (auto i: boost::filesystem::directory_iterator(path)) { + content.push_back (make_shared(i.path())); } } @@ -202,12 +165,12 @@ content_factory (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(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; @@ -216,11 +179,11 @@ content_factory (boost::filesystem::path path) throw KDMAsContentError (); } single.reset (new DCPSubtitleContent(path)); - } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) { + } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf(path)) { single.reset (new DCPSubtitleContent(path)); - } else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) { + } else if (ext == ".mxf" && VideoMXFContent::valid_mxf(path)) { single.reset (new VideoMXFContent(path)); - } else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) { + } else if (ext == ".mxf" && AtmosMXFContent::valid_mxf(path)) { single.reset (new AtmosMXFContent(path)); }