X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip_content.cc;h=fc0637bfd89d523140c60ea7ca58f8b0bee9d150;hb=59e769023c392c332331567a1aea94660002c463;hp=9212add688c05b04ac7cba5ac3563211cd6a966c;hpb=cc3900735839ff4b0da0c046b5c606c440ba917a;p=dcpomatic.git

diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index 9212add68..fc0637bfd 100644
--- a/src/lib/subrip_content.cc
+++ b/src/lib/subrip_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,15 +20,20 @@
 #include "subrip_content.h"
 #include "util.h"
 #include "subrip.h"
+#include "film.h"
+#include "font.h"
+#include <dcp/raw_convert.h>
 
 #include "i18n.h"
 
-using std::stringstream;
 using std::string;
 using std::cout;
+using dcp::raw_convert;
 using boost::shared_ptr;
 using boost::lexical_cast;
 
+std::string const SubRipContent::font_id = "font";
+
 SubRipContent::SubRipContent (shared_ptr<const Film> film, boost::filesystem::path path)
 	: Content (film, path)
 	, SubtitleContent (film, path)
@@ -36,10 +41,10 @@ SubRipContent::SubRipContent (shared_ptr<const Film> film, boost::filesystem::pa
 
 }
 
-SubRipContent::SubRipContent (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int version)
+SubRipContent::SubRipContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
 	: Content (film, node)
 	, SubtitleContent (film, node, version)
-	, _length (node->number_child<DCPTime> ("Length"))
+	, _length (node->number_child<DCPTime::Type> ("Length"))
 {
 
 }
@@ -49,8 +54,15 @@ SubRipContent::examine (boost::shared_ptr<Job> job)
 {
 	Content::examine (job);
 	SubRip s (shared_from_this ());
+
+	shared_ptr<const Film> film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+	
+	DCPTime len (s.length (), film->active_frame_rate_change (position ()));
+
 	boost::mutex::scoped_lock lm (_mutex);
-	_length = s.length ();
+	_length = len;
+	_fonts.push_back (shared_ptr<Font> (new Font (font_id)));
 }
 
 string
@@ -65,21 +77,13 @@ SubRipContent::technical_summary () const
 	return Content::technical_summary() + " - " + _("SubRip subtitles");
 }
 
-string
-SubRipContent::information () const
-{
-	
-}
-	
 void
 SubRipContent::as_xml (xmlpp::Node* node) const
 {
-	LocaleGuard lg;
-	
 	node->add_child("Type")->add_child_text ("SubRip");
 	Content::as_xml (node);
 	SubtitleContent::as_xml (node);
-	node->add_child("Length")->add_child_text (lexical_cast<string> (_length));
+	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
 }
 
 DCPTime
@@ -90,17 +94,3 @@ SubRipContent::full_length () const
 	*/
 	return _length;
 }
-
-string
-SubRipContent::identifier () const
-{
-	LocaleGuard lg;
-
-	stringstream s;
-	s << Content::identifier()
-	  << "_" << subtitle_scale()
-	  << "_" << subtitle_x_offset()
-	  << "_" << subtitle_y_offset();
-
-	return s.str ();
-}