X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.cc;h=43936314b5c41238ad17fafcb37d7ff4a8b8adc6;hp=83b0d200cee33146c6f92b33a1de1bd0b34df0da;hb=84a0d8a228f36f95ac265bac163c8e3f02dc1fd0;hpb=cc27c2716f755305d67f1e1ba828ecf37f8405dd

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 83b0d200c..43936314b 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -1,63 +1,94 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <dcp/subtitle_content.h>
-#include <dcp/raw_convert.h>
+#include "font.h"
 #include "dcp_subtitle_content.h"
+#include "film.h"
+#include "text_content.h"
+#include <dcp/raw_convert.h>
+#include <dcp/interop_subtitle_asset.h>
+#include <dcp/smpte_subtitle_asset.h>
+#include <dcp/interop_load_font_node.h>
+#include <libxml++/libxml++.h>
+#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
 using std::string;
 using std::list;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
-DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
-	: Content (film, path)
-	, SubtitleContent (film, path)
+DCPSubtitleContent::DCPSubtitleContent (boost::filesystem::path path)
+	: Content (path)
 {
-	
+	text.push_back (shared_ptr<TextContent> (new TextContent (this, TEXT_OPEN_SUBTITLE, TEXT_OPEN_SUBTITLE)));
 }
 
-DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
-	: Content (film, node)
-	, SubtitleContent (film, node, version)
-	, _length (node->number_child<DCPTime::Type> ("Length"))
+DCPSubtitleContent::DCPSubtitleContent (cxml::ConstNodePtr node, int version)
+	: Content (node)
+	, _length (node->number_child<ContentTime::Type> ("Length"))
 {
-
+	text = TextContent::from_xml (this, node, version);
 }
 
 void
-DCPSubtitleContent::examine (shared_ptr<Job> job)
+DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 {
-	Content::examine (job);
-	dcp::SubtitleContent sc (path (0), false);
-	_length = DCPTime::from_seconds (sc.latest_subtitle_out().to_seconds ());
+	Content::examine (film, job);
+
+	shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
+
+	shared_ptr<dcp::InteropSubtitleAsset> iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset> (sc);
+	shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
+	if (smpte) {
+		set_video_frame_rate (smpte->edit_rate().numerator);
+	}
+
+	boost::mutex::scoped_lock lm (_mutex);
+
+	/* Default to turning these subtitles on */
+	only_text()->set_use (true);
+
+	_length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
+
+	sc->fix_empty_font_ids ();
+
+	BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
+		only_text()->add_font (shared_ptr<Font> (new Font (i->id)));
+	}
 }
 
 DCPTime
-DCPSubtitleContent::full_length () const
+DCPSubtitleContent::full_length (shared_ptr<const Film> film) const
 {
-	/* XXX: this assumes that the timing of the subtitle file is appropriate
-	   for the DCP's frame rate.
-	*/
-	return _length;
+	FrameRateChange const frc (film, shared_from_this());
+	return DCPTime (_length, frc);
+}
+
+DCPTime
+DCPSubtitleContent::approximate_length () const
+{
+	return DCPTime (_length, FrameRateChange());
 }
 
 string
@@ -71,18 +102,16 @@ DCPSubtitleContent::technical_summary () const
 {
 	return Content::technical_summary() + " - " + _("DCP XML subtitles");
 }
-      
-string
-DCPSubtitleContent::information () const
-{
-
-}
 
 void
-DCPSubtitleContent::as_xml (xmlpp::Node* node) const
+DCPSubtitleContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
 	node->add_child("Type")->add_child_text ("DCPSubtitle");
-	Content::as_xml (node);
-	SubtitleContent::as_xml (node);
+	Content::as_xml (node, with_paths);
+
+	if (only_text()) {
+		only_text()->as_xml (node);
+	}
+
 	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
 }