Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;

[dcpomatic.git] / src / lib / subrip_content.h

diff --git a/src/lib/subrip_content.h b/src/lib/subrip_content.h
index 741e1a4c3ba5618f0ca94bbac0b9a69d798232b9..243032691b76b0179205f5614098e51cc8e25bb7 100644 (file)
--- a/src/lib/subrip_content.h
+++ b/src/lib/subrip_content.h
@@ -23,16 +23,25 @@ class SubRipContent : public SubtitleContent
 {
 public:
        SubRipContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-       SubRipContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int);
-
-       void examine (boost::shared_ptr<Job>);
+       SubRipContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
+
+       boost::shared_ptr<SubRipContent> shared_from_this () {
+               return boost::dynamic_pointer_cast<SubRipContent> (Content::shared_from_this ());
+       }
+       
+       /* Content */
+       void examine (boost::shared_ptr<Job>, bool calculate_digest);
        std::string summary () const;
        std::string technical_summary () const;
        std::string information () const;
-       void as_xml (xmlpp::Node *);
-       Time full_length () const;
-       std::string identifier () const;
+       void as_xml (xmlpp::Node *) const;
+       DCPTime full_length () const;
+
+       /* SubtitleContent */
+       bool has_subtitles () const {
+               return true;
+       }
 
 private:
-       Time _length;
+       DCPTime _length;
 };