swaroop: take ownership of config file if we're run as root.

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

diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 7f53c9a4b0b8a34a62d12ed8cd012b3f772dd000..df23ef6f604cb5d476a90f90231a4f9cdeea5c76 100644 (file)
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -24,8 +24,8 @@
 #include "dcp_decoder.h"
 #include "image_content.h"
 #include "image_decoder.h"
-#include "text_subtitle_content.h"
-#include "text_subtitle_decoder.h"
+#include "string_text_file_content.h"
+#include "string_text_file_decoder.h"
 #include "dcp_subtitle_content.h"
 #include "dcp_subtitle_decoder.h"
 #include "video_mxf_content.h"
@@ -37,7 +37,7 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
 shared_ptr<Decoder>
-decoder_factory (shared_ptr<const Content> content, list<shared_ptr<ImageDecoder> > old_image_decoders, shared_ptr<Log> log, bool fast)
+decoder_factory (shared_ptr<const Content> content, shared_ptr<Log> log, bool fast)
 {
        shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (content);
        if (fc) {
@@ -46,35 +46,27 @@ decoder_factory (shared_ptr<const Content> content, list<shared_ptr<ImageDecoder
 
        shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (content);
        if (dc) {
-               return shared_ptr<Decoder> (new DCPDecoder (dc, log, fast));
+               try {
+                       return shared_ptr<Decoder> (new DCPDecoder (dc, log, fast));
+               } catch (KDMError& e) {
+                       /* This will be found and reported to the user when the content is examined */
+                       return shared_ptr<Decoder>();
+               }
        }
 
        shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (content);
        if (ic) {
-               shared_ptr<Decoder> decoder;
-
-               /* See if we can re-use an old ImageDecoder */
-               BOOST_FOREACH (shared_ptr<ImageDecoder> i, old_image_decoders) {
-                       if (i->content() == ic) {
-                               decoder = i;
-                       }
-               }
-
-               if (!decoder) {
-                       decoder.reset (new ImageDecoder (ic, log));
-               }
-
-               return decoder;
+               return shared_ptr<Decoder> (new ImageDecoder (ic, log));
        }
 
-       shared_ptr<const TextSubtitleContent> rc = dynamic_pointer_cast<const TextSubtitleContent> (content);
+       shared_ptr<const StringTextFileContent> rc = dynamic_pointer_cast<const StringTextFileContent> (content);
        if (rc) {
-               return shared_ptr<Decoder> (new TextSubtitleDecoder (rc));
+               return shared_ptr<Decoder> (new StringTextFileDecoder (rc, log));
        }
 
        shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (content);
        if (dsc) {
-               return shared_ptr<Decoder> (new DCPSubtitleDecoder (dsc));
+               return shared_ptr<Decoder> (new DCPSubtitleDecoder (dsc, log));
        }
 
        shared_ptr<const VideoMXFContent> vmc = dynamic_pointer_cast<const VideoMXFContent> (content);