From: Carl Hetherington Date: Sun, 28 Feb 2016 12:26:44 +0000 (+0000) Subject: Try to improve detection of image sequence vs. DCP. X-Git-Tag: v2.6.27~1 X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=d15e78baea5b9df87019cd6be1b58a1b949af5c2;p=dcpomatic.git Try to improve detection of image sequence vs. DCP. --- diff --git a/ChangeLog b/ChangeLog index ab6fc737d..edabde9cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-02-28 Carl Hetherington + * Ignore subdirectories when deciding whether a folder + contains an image sequence or a DCP. + * Updated nl_NL translation from Rob van Nieuwkerk. 2016-02-27 Carl Hetherington 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; }