* @brief Methods to create content objects.
*/
-#include <libcxml/cxml.h>
#include "ffmpeg_content.h"
#include "image_content.h"
#include "sndfile_content.h"
#include "dcp_content.h"
#include "dcp_subtitle_content.h"
#include "util.h"
+#include <libcxml/cxml.h>
+#include <dcp/smpte_subtitle_asset.h>
using std::string;
using std::list;
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") {
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>
{
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, ++read) {
+ if (!boost::filesystem::is_regular_file (i->path()) || !valid_image_file (i->path())) {
+ is_dcp = true;
+ }
+ }
+
+ 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") {
+ content.reset (new SubRipContent (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;