Merge 1.0-seek and subtitle-content.

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

diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index b13f64dedc29d56fd7000f86ee4ed6f9e3ff3fda..48d3528e14d881265dd93466b622038c207492a1 100644 (file)
--- a/src/lib/subrip_content.cc
+++ b/src/lib/subrip_content.cc
@@ -76,7 +76,7 @@ SubRipContent::as_xml (xmlpp::Node* node)
        SubtitleContent::as_xml (node);
 }
 
-Time
+DCPTime
 SubRipContent::full_length () const
 {
        /* XXX: this assumes that the timing of the SubRip file is appropriate