X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.cc;h=e7057efc4b59528585e77965d88233d52275cf7b;hp=9f2ff61c5aea829be5d5331f2dd9b4126e9493a9;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=59e769023c392c332331567a1aea94660002c463

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 9f2ff61c5..e7057efc4 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -1,49 +1,52 @@
 /*
     Copyright (C) 2014-2015 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 "font.h"
 #include "dcp_subtitle_content.h"
-#include <dcp/interop_subtitle_content.h>
-#include <dcp/smpte_subtitle_content.h>
-#include <dcp/interop_load_font.h>
-#include <dcp/raw_convert.h>
+#include "raw_convert.h"
+#include "film.h"
+#include "subtitle_content.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 dcp::raw_convert;
+using boost::dynamic_pointer_cast;
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
 	: Content (film, path)
-	, SubtitleContent (film, path)
 {
-	
+	subtitle.reset (new SubtitleContent (this));
 }
 
 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"))
+	, _length (node->number_child<ContentTime::Type> ("Length"))
 {
-
+	subtitle = SubtitleContent::from_xml (this, node, version);
 }
 
 void
@@ -51,26 +54,37 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
 {
 	Content::examine (job);
 
-	shared_ptr<dcp::SubtitleContent> sc = load (path (0));
-	
+	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);
-	
-	_subtitle_language = sc->language ();
-	_length = DCPTime::from_seconds (sc->latest_subtitle_out().to_seconds ());
 
-	list<shared_ptr<dcp::LoadFont> > fonts = sc->load_font_nodes ();
-	for (list<shared_ptr<dcp::LoadFont> >::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
-		_fonts.push_back (shared_ptr<Font> (new Font ((*i)->id)));
+	/* Default to turning these subtitles on */
+	subtitle->set_use (true);
+
+	if (iop) {
+		subtitle->set_language (iop->language ());
+	} else if (smpte) {
+		subtitle->set_language (smpte->language().get_value_or (""));
+	}
+
+	_length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
+
+	BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
+		subtitle->add_font (shared_ptr<Font> (new Font (i->id)));
 	}
 }
 
 DCPTime
 DCPSubtitleContent::full_length () const
 {
-	/* XXX: this assumes that the timing of the subtitle file is appropriate
-	   for the DCP's frame rate.
-	*/
-	return _length;
+	FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
+	return DCPTime (_length, frc);
 }
 
 string
@@ -84,12 +98,16 @@ DCPSubtitleContent::technical_summary () const
 {
 	return Content::technical_summary() + " - " + _("DCP XML subtitles");
 }
-      
+
 void
 DCPSubtitleContent::as_xml (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text ("DCPSubtitle");
 	Content::as_xml (node);
-	SubtitleContent::as_xml (node);
+
+	if (subtitle) {
+		subtitle->as_xml (node);
+	}
+
 	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
 }