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/dcp_reader.h | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) (limited to 'src/dcp_reader.h') diff --git a/src/dcp_reader.h b/src/dcp_reader.h index 82a211c..8f49dfd 100644 --- a/src/dcp_reader.h +++ b/src/dcp_reader.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2015 Carl Hetherington + Copyright (C) 2014-2017 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,41 +21,17 @@ #define LIBSUB_DCP_READER_H #include "reader.h" -#include -#include #include namespace sub { -namespace dcp { - class Font; - class Text; - class Subtitle; -} - /** @class DCPReader * @brief A class which reads DCP subtitles. */ class DCPReader : public Reader { -protected: - - struct ParseState { - std::list > font_nodes; - std::list > text_nodes; - std::list > subtitle_nodes; - }; - - void parse_common (cxml::NodePtr root, boost::optional tcr); - - std::string _id; - -private: - void parse_node (xmlpp::Node const * node, ParseState& parse_state, boost::optional tcr); - void maybe_add_subtitle (std::string text, ParseState const & parse_state); - - std::string _reel_number; - std::string _language; +public: + DCPReader (boost::filesystem::path file); }; } -- cgit v1.2.3