X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_factory.cc;h=c3278e30e1bf02f626f9f77dd6e408f9956acc69;hb=504c63b3d62038bc486ca8a09e77fbb403907edd;hp=789496d08e043c7d911ce2991eff4f689b3e4e68;hpb=74fe68e5895654e27a7cf8097917c1e95fa89519;p=dcpomatic.git

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 789496d08..c3278e30e 100644
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -21,17 +21,27 @@
  *  @brief Methods to create content objects.
  */
 
-#include <libcxml/cxml.h>
 #include "ffmpeg_content.h"
 #include "image_content.h"
 #include "sndfile_content.h"
-#include "subrip_content.h"
+#include "text_subtitle_content.h"
+#include "dcp_content.h"
+#include "dcp_subtitle_content.h"
 #include "util.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;
 
+#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.
@@ -45,23 +55,27 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l
 	string const type = node->string_child ("Type");
 
 	boost::shared_ptr<Content> content;
-	
+
 	if (type == "FFmpeg") {
 		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));
-	} else if (type == "SubRip") {
-		content.reset (new SubRipContent (film, node, 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));
 	}
 
 	return content;
 }
 
-/** Create a Content object from a file, depending on its extension.
+/** Create a Content object from a file or directory.
  *  @param film Film that the content will be in.
- *  @param path File's path.
+ *  @param path File or directory.
  *  @return Content object.
  */
 shared_ptr<Content>
@@ -69,17 +83,73 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
 {
 	shared_ptr<Content> content;
 
-	string ext = path.extension().string ();
-	transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
-		
-	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") {
-		content.reset (new SubRipContent (film, path));
+	if (boost::filesystem::is_directory (path)) {
+
+		LOG_GENERAL ("Look in directory %1", path);
+
+		if (boost::filesystem::is_empty (path)) {
+			return shared_ptr<Content> ();
+		}
+
+		/* Guess if this is a DCP or a set of images: read the first ten filenames and if they
+		   are all valid image files we assume it is a set of images.
+		*/
+
+		bool is_dcp = false;
+		int read = 0;
+		for (boost::filesystem::directory_iterator i(path); i != boost::filesystem::directory_iterator() && read < 10; ++i) {
+
+			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());
+				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 (!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;
+			}
+
+			++read;
+		}
+
+		if (is_dcp) {
+			content.reset (new DCPContent (film, path));
+		} else {
+			content.reset (new ImageContent (film, path));
+		}
+
 	} else {
-		content.reset (new FFmpegContent (film, path));
+
+		string ext = path.extension().string ();
+		transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
+
+		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") {
+			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));
+		}
+
+		if (!content) {
+			content.reset (new FFmpegContent (film, path));
+		}
 	}
 
 	return content;