X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.h;h=05af716906a31b05f96de284c4cbf1df5e62b9b7;hb=5ae794047e5ceee4502e59211f0083a60224f4bd;hp=e1a0b64908dfa9e3126b97dccc889262da7cc1c9;hpb=92fcfff515d8416c8b175cb5e68dd492963362d5;p=dcpomatic.git diff --git a/src/lib/dcp_subtitle_content.h b/src/lib/dcp_subtitle_content.h index e1a0b6490..05af71690 100644 --- a/src/lib/dcp_subtitle_content.h +++ b/src/lib/dcp_subtitle_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2015 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 @@ -18,15 +18,16 @@ */ #include "subtitle_content.h" +#include "dcp_subtitle.h" -class DCPSubtitleContent : public SubtitleContent +class DCPSubtitleContent : public SubtitleContent, public DCPSubtitle { public: DCPSubtitleContent (boost::shared_ptr, boost::filesystem::path); DCPSubtitleContent (boost::shared_ptr, cxml::ConstNodePtr, int); /* Content */ - void examine (boost::shared_ptr, bool calculate_digest); + void examine (boost::shared_ptr); std::string summary () const; std::string technical_summary () const; void as_xml (xmlpp::Node *) const;