diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-01-11 10:57:09 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-01-11 11:23:42 +0000 |
| commit | 04ae4d393603da286d78a72c4f60c545c03b35e8 (patch) | |
| tree | c7ce2f66a96d76408587bc22c9b88688a2c943e0 /src/reader_factory.cc | |
| parent | 586f9b90034640c82eb51d7e4573f4125a2f4ad0 (diff) | |
Replace DCP parser with basic version that uses libdcp.
Diffstat (limited to 'src/reader_factory.cc')
| -rw-r--r-- | src/reader_factory.cc | 16 |
1 files changed, 3 insertions, 13 deletions
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 <libxml++/libxml++.h> #include <boost/algorithm/string.hpp> #include <fstream> @@ -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<Reader> (new InteropDCPReader (file_name)); - } else if (root == "SubtitleReel") { - return shared_ptr<Reader> (new SMPTEDCPReader (file_name, false)); - } + return shared_ptr<Reader> (new DCPReader (file_name)); } if (ext == ".mxf") { /* Assume this is some MXF-wrapped SMPTE subtitles */ - return shared_ptr<Reader> (new SMPTEDCPReader (file_name, true)); + return shared_ptr<Reader> (new DCPReader (file_name)); } if (ext == ".stl") { |