#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;
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") {
shared_ptr<Content> content;
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) {
+ 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 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 == ".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)) {