X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_factory.cc;h=d3905e4e7c443a2d0c59bb06947f57b669c09f46;hb=ebc36d56736997b40a51301a8746c6727cc34b1f;hp=2b17d69e42bdbd1525035eb479f79934b4d99ebe;hpb=80400212e939dc2f3b987cb6df57709929aa5178;p=dcpomatic.git diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index 2b17d69e4..d3905e4e7 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -22,12 +23,19 @@ */ #include "ffmpeg_content.h" +#include "audio_content.h" #include "image_content.h" -#include "sndfile_content.h" +#include "atmos_mxf_content.h" #include "text_subtitle_content.h" #include "dcp_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 "log.h" +#include "compose.hpp" #include #include #include @@ -35,6 +43,9 @@ 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. @@ -51,17 +62,39 @@ content_factory (shared_ptr film, cxml::NodePtr node, int version, l boost::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)); } else if (type == "Image") { content.reset (new ImageContent (film, node, version)); } else if (type == "Sndfile") { - content.reset (new SndfileContent (film, node, version)); + /* SndfileContent is now handled by the FFmpeg code rather than by + separate libsndfile-based code. + */ + content.reset (new FFmpegContent (film, 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) + ) + ) + ); + } else if (type == "SubRip" || type == "TextSubtitle") { content.reset (new TextSubtitleContent (film, node, version)); } else if (type == "DCP") { content.reset (new DCPContent (film, node, version)); } else if (type == "DCPSubtitle") { content.reset (new DCPSubtitleContent (film, node, version)); + } else if (type == "VideoMXF") { + content.reset (new VideoMXFContent (film, node, version)); + } else if (type == "AtmosMXF") { + content.reset (new AtmosMXFContent (film, node, version)); } return content; @@ -79,6 +112,8 @@ content_factory (shared_ptr film, boost::filesystem::path path) if (boost::filesystem::is_directory (path)) { + LOG_GENERAL ("Look in directory %1", path); + if (boost::filesystem::is_empty (path)) { return shared_ptr (); } @@ -91,12 +126,25 @@ content_factory (shared_ptr film, boost::filesystem::path path) int read = 0; for (boost::filesystem::directory_iterator i(path); i != boost::filesystem::directory_iterator() && read < 10; ++i) { - if (boost::starts_with (i->path().leaf().string(), "._")) { - /* We ignore these files */ + LOG_GENERAL ("Checking file %1", i->path()); + + if (boost::starts_with (i->path().leaf().string(), ".")) { + /* We ignore hidden files */ + LOG_GENERAL ("Ignored %1 (starts with .)", i->path()); + continue; + } + + if (!boost::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 (!boost::filesystem::is_regular_file (i->path()) || !valid_image_file (i->path())) { + 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; } @@ -116,14 +164,16 @@ content_factory (shared_ptr film, boost::filesystem::path path) if (valid_image_file (path)) { content.reset (new ImageContent (film, path)); - } else if (SndfileContent::valid_file (path)) { - content.reset (new SndfileContent (film, path)); - } else if (ext == ".srt" || ext == ".ssa") { + } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass") { content.reset (new TextSubtitleContent (film, 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)); } if (!content) {