X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip_content.cc;h=d7825f518f977a4d525227572469d9f63f2482bb;hb=24d54ea7fe1ba128cf8d3521d6738fc73a7c623e;hp=48d3528e14d881265dd93466b622038c207492a1;hpb=b299c1873bf23414061d551843275c77a9256a05;p=dcpomatic.git

diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index 48d3528e1..d7825f518 100644
--- a/src/lib/subrip_content.cc
+++ b/src/lib/subrip_content.cc
@@ -20,12 +20,17 @@
 #include "subrip_content.h"
 #include "util.h"
 #include "subrip.h"
+#include "film.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;
 
 SubRipContent::SubRipContent (shared_ptr<const Film> film, boost::filesystem::path path)
 	: Content (film, path)
@@ -34,9 +39,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)
+SubRipContent::SubRipContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
 	: Content (film, node)
-	, SubtitleContent (film, node)
+	, SubtitleContent (film, node, version)
+	, _length (node->number_child<int64_t> ("Length"))
 {
 
 }
@@ -46,8 +52,14 @@ SubRipContent::examine (boost::shared_ptr<Job> job)
 {
 	Content::examine (job);
 	SubRip s (shared_from_this ());
+
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
+	
+	DCPTime len (s.length (), film->active_frame_rate_change (position ()));
+
 	boost::mutex::scoped_lock lm (_mutex);
-	_length = s.length ();
+	_length = len;
 }
 
 string
@@ -69,11 +81,12 @@ SubRipContent::information () const
 }
 	
 void
-SubRipContent::as_xml (xmlpp::Node* node)
+SubRipContent::as_xml (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text ("SubRip");
 	Content::as_xml (node);
 	SubtitleContent::as_xml (node);
+	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
 }
 
 DCPTime
@@ -88,12 +101,18 @@ SubRipContent::full_length () const
 string
 SubRipContent::identifier () const
 {
-	LocaleGuard lg;
-
 	stringstream s;
 	s << Content::identifier()
-	  << "_" << subtitle_scale()
-	  << "_" << subtitle_offset();
+	  << "_" << 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;
+}