X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip_content.cc;h=7a336f88af632d3770eeed3beb3f9cd82b0915e7;hb=c008066160d85b9ec9e5485375d7baaa5d27bda2;hp=d7825f518f977a4d525227572469d9f63f2482bb;hpb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;p=dcpomatic.git

diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index d7825f518..7a336f88a 100644
--- a/src/lib/subrip_content.cc
+++ b/src/lib/subrip_content.cc
@@ -25,7 +25,6 @@
 
 #include "i18n.h"
 
-using std::stringstream;
 using std::string;
 using std::cout;
 using dcp::raw_convert;
@@ -42,15 +41,15 @@ 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"))
 {
 
 }
 
 void
-SubRipContent::examine (boost::shared_ptr<Job> job)
+SubRipContent::examine (boost::shared_ptr<Job> job, bool calculate_digest)
 {
-	Content::examine (job);
+	Content::examine (job, calculate_digest);
 	SubRip s (shared_from_this ());
 
 	shared_ptr<const Film> film = _film.lock ();
@@ -77,7 +76,7 @@ SubRipContent::technical_summary () const
 string
 SubRipContent::information () const
 {
-	
+
 }
 	
 void
@@ -97,22 +96,3 @@ SubRipContent::full_length () const
 	*/
 	return _length;
 }
-
-string
-SubRipContent::identifier () const
-{
-	stringstream s;
-	s << Content::identifier()
-	  << "_" << raw_convert<string> (subtitle_scale())
-	  << "_" << raw_convert<string> (subtitle_x_offset())
-	  << "_" << raw_convert<string> (subtitle_y_offset());
-
-	return s.str ();
-}
-
-bool
-SubRipContent::has_subtitle_during (ContentTimePeriod) const
-{
-	/* XXX */
-	return false;
-}