Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert...

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

diff --git a/src/lib/subrip_content.h b/src/lib/subrip_content.h
index 3a8380cec56e1846060c3eacad2ecf4ea7dac1f8..0202e21d7f32eb782a81989cc27947c75ea748fe 100644 (file)
--- a/src/lib/subrip_content.h
+++ b/src/lib/subrip_content.h
@@ -23,20 +23,27 @@ 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);
+       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 ());
        }
        
-       void examine (boost::shared_ptr<Job>);
+       /* 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 *) const;
        DCPTime full_length () const;
-       std::string identifier () const;
 
+       /* SubtitleContent */
+       bool has_subtitles () const {
+               return true;
+       }
+
+       static std::string const font_id;
+       
 private:
        DCPTime _length;
 };