Fix handling of timing in SMPTE subtitles.

[libdcp.git] / src / subtitle_content.h

diff --git a/src/subtitle_content.h b/src/subtitle_content.h
index 349a69c8856715c17f16561fecf5ad64113306f5..0ef7b19d478a3e3438cadcf997c2160fae7c953e 100644 (file)
--- a/src/subtitle_content.h
+++ b/src/subtitle_content.h
@@ -32,6 +32,7 @@ class SubtitleString;
 class Font;
 class Text;
 class Subtitle;
+class LoadFont;
 
 /** @class SubtitleContent
  *  @brief A parent for classes representing a file containing subtitles.
@@ -45,14 +46,14 @@ public:
        bool equals (
                boost::shared_ptr<const Asset>,
                EqualityOptions,
-               boost::function<void (NoteType, std::string)> note
+               NoteHandler note
                ) const;
 
        std::string language () const {
                return _language;
        }
 
-       std::list<SubtitleString> subtitles_at (Time t) const;
+       std::list<SubtitleString> subtitles_during (Time from, Time to) const;
        std::list<SubtitleString> const & subtitles () const {
                return _subtitles;
        }
@@ -67,8 +68,10 @@ public:
 
        Time latest_subtitle_out () const;
 
+       virtual std::list<boost::shared_ptr<LoadFont> > load_font_nodes () const = 0;
+
 protected:
-       void parse_common (boost::shared_ptr<cxml::Document> xml, std::list<boost::shared_ptr<dcp::Font> > font_nodes);
+       void parse_common (boost::shared_ptr<cxml::Document> xml, std::list<boost::shared_ptr<Font> > font_nodes);
        
        std::string pkl_type (Standard) const {
                return "text/xml";