return content;
}
-/** Create a Content object from a file or directory.
+/** Create some Content objects from a file or directory.
* @param film Film that the content will be in.
* @param path File or directory.
- * @return Content object.
+ * @return Content objects.
*/
-shared_ptr<Content>
+list<shared_ptr<Content> >
content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
{
- shared_ptr<Content> content;
+ list<shared_ptr<Content> > content;
if (boost::filesystem::is_directory (path)) {
LOG_GENERAL ("Look in directory %1", path);
if (boost::filesystem::is_empty (path)) {
- return shared_ptr<Content> ();
+ return 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.
- */
+ /* See if this is a set of images or a set of sound files */
- bool is_dcp = false;
+ int image_files = 0;
+ int sound_files = 0;
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());
+ if (boost::starts_with (i->path().leaf().string(), ".")) {
+ /* We ignore hidden files */
+ LOG_GENERAL ("Ignored %1 (starts with .)", i->path());
continue;
}
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;
+ if (valid_image_file (i->path ())) {
+ ++image_files;
+ }
+
+ if (valid_sound_file (i->path ())) {
+ ++sound_files;
}
++read;
}
- if (is_dcp) {
- content.reset (new DCPContent (film, path));
- } else {
- content.reset (new ImageContent (film, path));
+ if (image_files > 0 && sound_files == 0) {
+ content.push_back (shared_ptr<Content> (new ImageContent (film, path)));
+ } else if (image_files == 0 && sound_files > 0) {
+ for (boost::filesystem::directory_iterator i(path); i != boost::filesystem::directory_iterator(); ++i) {
+ content.push_back (shared_ptr<FFmpegContent> (new FFmpegContent (film, i->path())));
+ }
}
} else {
+ shared_ptr<Content> single;
+
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 (ext == ".srt" || ext == ".ssa") {
- content.reset (new TextSubtitleContent (film, path));
+ single.reset (new ImageContent (film, path));
+ } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass") {
+ single.reset (new TextSubtitleContent (film, path));
} else if (ext == ".xml") {
- content.reset (new DCPSubtitleContent (film, path));
+ single.reset (new DCPSubtitleContent (film, path));
} else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) {
- content.reset (new DCPSubtitleContent (film, path));
+ single.reset (new DCPSubtitleContent (film, path));
} else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) {
- content.reset (new VideoMXFContent (film, path));
+ single.reset (new VideoMXFContent (film, path));
} else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) {
- content.reset (new AtmosMXFContent (film, path));
+ single.reset (new AtmosMXFContent (film, path));
}
- if (!content) {
- content.reset (new FFmpegContent (film, path));
+ if (!single) {
+ single.reset (new FFmpegContent (film, path));
}
+
+ content.push_back (single);
}
return content;