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

diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index d7825f518..f9d184b9d 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
@@ -21,17 +21,18 @@
 #include "util.h"
 #include "subrip.h"
 #include "film.h"
-#include <dcp/raw_convert.h>
+#include "font.h"
+#include "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)
@@ -42,7 +43,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"))
 {
 
 }
@@ -54,12 +55,13 @@ SubRipContent::examine (boost::shared_ptr<Job> job)
 	SubRip s (shared_from_this ());
 
 	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
+	DCPOMATIC_ASSERT (film);
 	
 	DCPTime len (s.length (), film->active_frame_rate_change (position ()));
 
 	boost::mutex::scoped_lock lm (_mutex);
 	_length = len;
+	_fonts.push_back (shared_ptr<Font> (new Font (font_id)));
 }
 
 string
@@ -74,12 +76,6 @@ SubRipContent::technical_summary () const
 	return Content::technical_summary() + " - " + _("SubRip subtitles");
 }
 
-string
-SubRipContent::information () const
-{
-	
-}
-	
 void
 SubRipContent::as_xml (xmlpp::Node* node) const
 {
@@ -97,22 +93,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;
-}