d588620e70bf15da29cc242e4ae8d86977e8f36a from master; fix hang if you cancel a paused...

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

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 16340adb43b0e74f8f14d4b2bc039e258d8e58a9..f4d9fe4e93f7734679a7e9145af58a227f8fb37b 100644 (file)
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -21,7 +21,6 @@
  *  @brief Methods to create content objects.
  */
 
-#include <libcxml/cxml.h>
 #include "ffmpeg_content.h"
 #include "image_content.h"
 #include "sndfile_content.h"
@@ -29,6 +28,8 @@
 #include "dcp_content.h"
 #include "dcp_subtitle_content.h"
 #include "util.h"
+#include <libcxml/cxml.h>
+#include <dcp/smpte_subtitle_content.h>
 
 using std::string;
 using std::list;
@@ -77,7 +78,7 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
 
        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 (SndfileContent::valid_file (path)) {
@@ -86,7 +87,11 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
                content.reset (new SubRipContent (film, path));
        } else if (ext == ".xml") {
                content.reset (new DCPSubtitleContent (film, path));
-       } else {
+       } else if (ext == ".mxf" && dcp::SMPTESubtitleContent::valid_mxf (path)) {
+               content.reset (new DCPSubtitleContent (film, path));
+       }
+
+       if (!content) {
                content.reset (new FFmpegContent (film, path));
        }