X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_factory.cc;h=dfa1ba55e4d4795ebdc66e23408390ec7c1b7814;hb=ff12ccdde76c54d3b9e69799a63750db9edf0023;hp=24ad9557807416624eb0e083663ad1691fd2ab46;hpb=c1f98c84cdf3829b31929453b8a89fdcbdcd0c42;p=dcpomatic.git diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index 24ad95578..dfa1ba55e 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -18,145 +18,105 @@ */ + /** @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 "plain_text_content.h" +#include "string_text_file_content.h" #include "dcp_content.h" -#include "dcp_text_content.h" +#include "dcp_subtitle_content.h" #include "util.h" #include "ffmpeg_audio_stream.h" #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 #include "i18n.h" -using std::string; + 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), + 16 ) ); } else if (type == "SubRip" || type == "TextSubtitle") { - content.reset (new PlainText (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 DCPTextContent (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)); - } - - /* 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); - } - - /* ...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 = make_shared(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) +vector> +content_factory (boost::filesystem::path path) { - list > content; + vector> content; - if (boost::filesystem::is_directory (path)) { + if (dcp::filesystem::is_directory(path)) { LOG_GENERAL ("Look in directory %1", path); - if (boost::filesystem::is_empty (path)) { + if (dcp::filesystem::is_empty(path)) { return content; } @@ -165,27 +125,27 @@ content_factory (shared_ptr film, boost::filesystem::path path) 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) { + for (dcp::filesystem::directory_iterator i(path); i != dcp::filesystem::directory_iterator() && read < 10; ++i) { LOG_GENERAL ("Checking file %1", i->path()); - if (boost::starts_with (i->path().leaf().string(), ".")) { + if (boost::starts_with(i->path().filename().string(), ".")) { /* We ignore hidden files */ LOG_GENERAL ("Ignored %1 (starts with .)", i->path()); continue; } - if (!boost::filesystem::is_regular_file(i->path())) { + if (!dcp::filesystem::is_regular_file(i->path())) { /* Ignore things which aren't files (probably directories) */ LOG_GENERAL ("Ignored %1 (not a regular file)", i->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; } @@ -193,10 +153,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: dcp::filesystem::directory_iterator(path)) { + content.push_back (make_shared(i.path())); } } @@ -204,30 +164,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 PlainText (film, path)); + single = make_shared(path); + } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass" || ext == ".stl" || ext == ".vtt") { + single = make_shared(path); } else if (ext == ".xml") { cxml::Document doc; - doc.read_file (path); + doc.read_file(dcp::filesystem::fix_long_path(path)); if (doc.root_name() == "DCinemaSecurityMessage") { throw KDMAsContentError (); } - single.reset (new DCPTextContent (film, path)); - } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) { - single.reset (new DCPTextContent (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 = 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 (!single) { - single.reset (new FFmpegContent (film, path)); + single = make_shared(path); } content.push_back (single);