X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_factory.cc;h=2b17d69e42bdbd1525035eb479f79934b4d99ebe;hb=80400212e939dc2f3b987cb6df57709929aa5178;hp=16340adb43b0e74f8f14d4b2bc039e258d8e58a9;hpb=fc56dc97103d00437843a31e1ef0c4915900ad1a;p=dcpomatic.git

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 16340adb4..2b17d69e4 100644
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -21,14 +21,16 @@
  *  @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 <libcxml/cxml.h>
+#include <dcp/smpte_subtitle_asset.h>
+#include <boost/algorithm/string.hpp>
 
 using std::string;
 using std::list;
@@ -47,15 +49,15 @@ 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") {
@@ -65,9 +67,9 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l
 	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>
@@ -75,19 +77,58 @@ 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));
-	} else if (ext == ".xml") {
-		content.reset (new DCPSubtitleContent (film, path));
+	if (boost::filesystem::is_directory (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) {
+
+			if (boost::starts_with (i->path().leaf().string(), "._")) {
+				/* We ignore these files */
+				continue;
+			}
+
+			if (!boost::filesystem::is_regular_file (i->path()) || !valid_image_file (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;