X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsubrip_content.cc;h=ba081624ac6ba166d0152ba2d5f8e3e0921823ff;hp=eb9c67d9a1948b709544c9cee4588e7e431545ce;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=1dcfb3a26085ebb3703f40e2f51e43ce3d98be50

diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index eb9c67d9a..ba081624a 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,15 +21,20 @@
 #include "util.h"
 #include "subrip.h"
 #include "film.h"
+#include "font.h"
+#include "raw_convert.h"
+#include <libxml++/libxml++.h>
+#include <iostream>
 
 #include "i18n.h"
 
-using std::stringstream;
 using std::string;
 using std::cout;
 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)
@@ -37,10 +42,11 @@ 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<int64_t> ("Length"))
+	, _length (node->number_child<ContentTime::Type> ("Length"))
+	, _frame_rate (node->optional_number_child<double>("SubtitleFrameRate"))
 {
 
 }
@@ -51,13 +57,12 @@ 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 ()));
+	/* Default to turning these subtitles on */
+	set_use_subtitles (true);
 
 	boost::mutex::scoped_lock lm (_mutex);
-	_length = len;
+	_length = s.length ();
+	add_font (shared_ptr<Font> (new Font (font_id)));
 }
 
 string
@@ -72,42 +77,49 @@ 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.get ()));
+	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
 }
 
 DCPTime
 SubRipContent::full_length () const
 {
-	/* XXX: this assumes that the timing of the SubRip file is appropriate
-	   for the DCP's frame rate.
-	*/
-	return _length;
+	shared_ptr<const Film> film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+	FrameRateChange const frc (subtitle_video_frame_rate(), film->video_frame_rate ());
+	return DCPTime (_length, frc);
 }
 
-string
-SubRipContent::identifier () const
+void
+SubRipContent::set_subtitle_video_frame_rate (int r)
 {
-	LocaleGuard lg;
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_frame_rate = r;
+	}
 
-	stringstream s;
-	s << Content::identifier()
-	  << "_" << subtitle_scale()
-	  << "_" << subtitle_x_offset()
-	  << "_" << subtitle_y_offset();
+	signal_changed (SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE);
+}
 
-	return s.str ();
+double
+SubRipContent::subtitle_video_frame_rate () const
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		if (_frame_rate) {
+			return _frame_rate.get ();
+		}
+	}
+
+	/* No frame rate specified, so assume this content has been
+	   prepared for any concurrent video content.
+	*/
+	shared_ptr<const Film> film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+	return film->active_frame_rate_change(position()).source;
 }