X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.h;h=05af716906a31b05f96de284c4cbf1df5e62b9b7;hb=5ae794047e5ceee4502e59211f0083a60224f4bd;hp=5794b59516e6767f586cc5d0a33663b2ed9ef376;hpb=7b2054e2a73844450b5b55c5788c02af671812ce;p=dcpomatic.git diff --git a/src/lib/dcp_subtitle_content.h b/src/lib/dcp_subtitle_content.h index 5794b5951..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,8 +18,9 @@ */ #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); @@ -29,7 +30,6 @@ public: void examine (boost::shared_ptr); std::string summary () const; std::string technical_summary () const; - std::string information () const; void as_xml (xmlpp::Node *) const; DCPTime full_length () const;