X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fcontent_factory.cc;h=d3905e4e7c443a2d0c59bb06947f57b669c09f46;hb=58b5c57c9a4767c786a1428f243c60ff52c82c26;hp=c3278e30e1bf02f626f9f77dd6e408f9956acc69;hpb=4c1039131b96f0e2cac8724e54a2e90d7afdad32;p=dcpomatic.git

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index c3278e30e..d3905e4e7 100644
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -1,19 +1,20 @@
 /*
-    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/>.
 
 */
 
@@ -22,12 +23,15 @@
  */
 
 #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"
@@ -39,6 +43,7 @@
 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);
 
@@ -57,17 +62,39 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l
 	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;
@@ -101,9 +128,9 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
 
 			LOG_GENERAL ("Checking file %1", i->path());
 
-			if (boost::starts_with (i->path().leaf().string(), "._") || i->path().leaf().string() == ".DS_Store") {
-				/* We ignore these files */
-				LOG_GENERAL ("Ignored %1 (starts with {._}, or .DS_Store)", i->path());
+			if (boost::starts_with (i->path().leaf().string(), ".")) {
+				/* We ignore hidden files */
+				LOG_GENERAL ("Ignored %1 (starts with .)", i->path());
 				continue;
 			}
 
@@ -137,14 +164,16 @@ content_factory (shared_ptr<const Film> 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) {