From d15e78baea5b9df87019cd6be1b58a1b949af5c2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 28 Feb 2016 12:26:44 +0000 Subject: Try to improve detection of image sequence vs. DCP. --- src/lib/content_factory.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index 2b17d69e4..911527384 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -96,7 +96,15 @@ content_factory (shared_ptr film, boost::filesystem::path path) continue; } - if (!boost::filesystem::is_regular_file (i->path()) || !valid_image_file (i->path())) { + if (!boost::filesystem::is_regular_file(i->path())) { + /* Ignore things which aren't files (probably directories) */ + continue; + } + + if (!valid_image_file (i->path())) { + /* We have a normal file which isn't an image; assume we are looking + at a DCP. + */ is_dcp = true; } -- cgit v1.2.3