From 3f630fb8334238ab8a58fbe1a0f513ae2c00de80 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 14 Jan 2015 17:39:32 +0000 Subject: Simplify time representation; better in-tree DCP subtitle parser. --- src/reader_factory.cc | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) (limited to 'src/reader_factory.cc') diff --git a/src/reader_factory.cc b/src/reader_factory.cc index 18783da..05634c0 100644 --- a/src/reader_factory.cc +++ b/src/reader_factory.cc @@ -17,12 +17,14 @@ */ -#include -#include #include "reader_factory.h" -#include "dcp_reader.h" +#include "interop_dcp_reader.h" +#include "smpte_dcp_reader.h" #include "stl_binary_reader.h" #include "stl_text_reader.h" +#include +#include +#include using std::string; using std::ifstream; @@ -35,14 +37,24 @@ sub::reader_factory (boost::filesystem::path file_name) { string ext = file_name.extension().string(); transform (ext.begin(), ext.end(), ext.begin(), ::tolower); - - if (ext == ".xml") { - return shared_ptr (new DCPReader (file_name, true)); - } - if (ext == ".mxf") { - return shared_ptr (new DCPReader (file_name, false)); - } + 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)); + } + } + + if (ext == ".mxf") { + /* Assume this is some MXF-wrapped SMPTE subtitles */ + return shared_ptr (new SMPTEDCPReader (file_name, true)); + } if (ext == ".stl") { /* Check the start of the DFC */ -- cgit v1.2.3