Merge master.

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

diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index d7825f518f977a4d525227572469d9f63f2482bb..455bd1e8fb32286c5ceecc00be0714d088e755d7 100644 (file)
--- a/src/lib/subrip_content.cc
+++ b/src/lib/subrip_content.cc
@@ -42,7 +42,7 @@ SubRipContent::SubRipContent (shared_ptr<const Film> film, boost::filesystem::pa
 SubRipContent::SubRipContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
        : Content (film, node)
        , SubtitleContent (film, node, version)
-       , _length (node->number_child<int64_t> ("Length"))
+       , _length (node->number_child<DCPTime::Type> ("Length"))
 {
 
 }
@@ -109,10 +109,3 @@ SubRipContent::identifier () const
 
        return s.str ();
 }
-
-bool
-SubRipContent::has_subtitle_during (ContentTimePeriod) const
-{
-       /* XXX */
-       return false;
-}