Add a couple of asserts.

[dcpomatic.git] / src / lib / content_factory.cc

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 9dd04203790e5d3abf8b03cd4780e9001ab287f6..e5e73f890b8592e9ca6df33af21056f2830d8608 100644 (file)
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -118,11 +118,10 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
                        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) {
 
@@ -140,21 +139,23 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
                                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.push_back (shared_ptr<Content> (new DCPContent (film, path)));
-               } else {
+               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 {
@@ -169,6 +170,11 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
                } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass") {
                        single.reset (new TextSubtitleContent (film, path));
                } else if (ext == ".xml") {
+                       cxml::Document doc;
+                       doc.read_file (path);
+                       if (doc.root_name() == "DCinemaSecurityMessage") {
+                               throw KDMAsContentError ();
+                       }
                        single.reset (new DCPSubtitleContent (film, path));
                } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) {
                        single.reset (new DCPSubtitleContent (film, path));