From f528fc50162db6fcecbaa2cd6121c7ee86a82777 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 11 Jan 2017 10:57:09 +0000 Subject: Replace DCP parser with basic version that uses libdcp. --- src/reader_factory.cc | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'src/reader_factory.cc') diff --git a/src/reader_factory.cc b/src/reader_factory.cc index 6c0259d..5d38e4e 100644 --- a/src/reader_factory.cc +++ b/src/reader_factory.cc @@ -18,10 +18,9 @@ */ #include "reader_factory.h" -#include "interop_dcp_reader.h" -#include "smpte_dcp_reader.h" #include "stl_binary_reader.h" #include "stl_text_reader.h" +#include "dcp_reader.h" #include #include #include @@ -39,21 +38,12 @@ sub::reader_factory (boost::filesystem::path file_name) transform (ext.begin(), ext.end(), ext.begin(), ::tolower); if (ext == ".xml") { - /* XXX: unfortunate API weakness in libcxml; we can't find out what a - file's root node name is. - */ - xmlpp::DomParser parser (file_name.string ()); - string const root = parser.get_document()->get_root_node()->get_name(); - if (root == "DCSubtitle") { - return shared_ptr (new InteropDCPReader (file_name)); - } else if (root == "SubtitleReel") { - return shared_ptr (new SMPTEDCPReader (file_name, false)); - } + return shared_ptr (new DCPReader (file_name)); } if (ext == ".mxf") { /* Assume this is some MXF-wrapped SMPTE subtitles */ - return shared_ptr (new SMPTEDCPReader (file_name, true)); + return shared_ptr (new DCPReader (file_name)); } if (ext == ".stl") { -- cgit v1.2.3