Make terminate_threads() less likely to leave _threads containing invalid pointers.

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

diff --git a/src/lib/dcp_subtitle_content.h b/src/lib/dcp_subtitle_content.h
index 36945adcdb4af8bdba3d696679ee811a1adc43a1..f5f375eee3570673d62ba97128829e6a1e802512 100644 (file)
--- a/src/lib/dcp_subtitle_content.h
+++ b/src/lib/dcp_subtitle_content.h
@@ -24,14 +24,15 @@
 class DCPSubtitleContent : public DCPSubtitle, public Content
 {
 public:
-       DCPSubtitleContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-       DCPSubtitleContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
+       DCPSubtitleContent (boost::filesystem::path);
+       DCPSubtitleContent (cxml::ConstNodePtr, int);
 
-       void examine (boost::shared_ptr<Job>);
+       void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
        std::string summary () const;
        std::string technical_summary () const;
        void as_xml (xmlpp::Node *, bool with_paths) const;
-       DCPTime full_length () const;
+       DCPTime full_length (boost::shared_ptr<const Film> film) const;
+       DCPTime approximate_length () const;
 
 private:
        ContentTime _length;