Bump libdcp for new equality option.

[libsub.git] / src / dcp_reader.h

diff --git a/src/dcp_reader.h b/src/dcp_reader.h
index 82a211c0ba53f4c06d20505343a5d4e14e456266..8f49dfd6e6d18d6f5e1db5170afdb6ffadeef879 100644 (file)
--- a/src/dcp_reader.h
+++ b/src/dcp_reader.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2017 Carl Hetherington <cth@carlh.net>
 
     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 <libcxml/cxml.h>
-#include <boost/shared_ptr.hpp>
 #include <boost/filesystem.hpp>
 
 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<boost::shared_ptr<dcp::Font> > font_nodes;
-               std::list<boost::shared_ptr<dcp::Text> > text_nodes;
-               std::list<boost::shared_ptr<dcp::Subtitle> > subtitle_nodes;
-       };
-
-       void parse_common (cxml::NodePtr root, boost::optional<int> tcr);
-
-       std::string _id;
-
-private:
-       void parse_node (xmlpp::Node const * node, ParseState& parse_state, boost::optional<int> 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);
 };
 
 }