/*
- Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
*/
#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 <libcxml/cxml.h>
#include <dcp/smpte_subtitle_asset.h>
#include <boost/algorithm/string.hpp>
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.
boost::shared_ptr<Content> 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<int> ("AudioFrameRate"),
+ node->number_child<Frame> ("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;
if (boost::filesystem::is_directory (path)) {
+ LOG_GENERAL ("Look in directory %1", path);
+
if (boost::filesystem::is_empty (path)) {
return shared_ptr<Content> ();
}
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;
}
/* 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 (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) {