#include "dcp_decoder.h"
#include "image_content.h"
#include "image_decoder.h"
-#include "text_text_content.h"
-#include "text_text_decoder.h"
-#include "dcp_text_content.h"
-#include "dcp_text_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"
#include "video_mxf_decoder.h"
#include <boost/foreach.hpp>
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);
return shared_ptr<Decoder> (new ImageDecoder (ic, log));
}
- shared_ptr<const TextTextContent> rc = dynamic_pointer_cast<const TextTextContent> (content);
+ shared_ptr<const StringTextFileContent> rc = dynamic_pointer_cast<const StringTextFileContent> (content);
if (rc) {
- return shared_ptr<Decoder> (new TextTextDecoder (rc, log));
+ return shared_ptr<Decoder> (new StringTextFileDecoder (rc, log));
}
- shared_ptr<const DCPTextContent> dsc = dynamic_pointer_cast<const DCPTextContent> (content);
+ shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (content);
if (dsc) {
- return shared_ptr<Decoder> (new DCPTextDecoder (dsc, log));
+ return shared_ptr<Decoder> (new DCPSubtitleDecoder (dsc, log));
}
shared_ptr<const VideoMXFContent> vmc = dynamic_pointer_cast<const VideoMXFContent> (content);