X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdcp_subtitle_content.cc;h=b361b941907551b160913bbe4121d872c8187661;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hp=b38c0c6a76e0b27ae56a6dd8b77f8547d01b0405;hpb=334b94526f2c1271718a94fe97cfa843cf6ef7a1;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index b38c0c6a7..b361b9419 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -1,19 +1,20 @@
 /*
     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/>.
 
 */
 
@@ -27,6 +28,7 @@
 #include <dcp/interop_load_font_node.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
 
 #include "i18n.h"
 
@@ -34,19 +36,19 @@ using std::string;
 using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using boost::make_shared;
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
 	: Content (film, path)
 {
-	subtitle.reset (new SubtitleContent (this, film));
+	subtitle.reset (new SubtitleContent (this));
 }
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
 	: Content (film, node)
 	, _length (node->number_child<ContentTime::Type> ("Length"))
-	, _frame_rate (node->optional_number_child<int>("SubtitleFrameRate"))
 {
-	subtitle.reset (new SubtitleContent (this, film, node, version));
+	subtitle = SubtitleContent::from_xml (this, node, version);
 }
 
 void
@@ -56,32 +58,34 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
 
 	shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
 
-	/* Default to turning these subtitles on */
-	subtitle->set_use_subtitles (true);
+	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);
 
-	shared_ptr<dcp::InteropSubtitleAsset> iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset> (sc);
+	/* Default to turning these subtitles on */
+	subtitle->set_use (true);
+
 	if (iop) {
-		subtitle->set_subtitle_language (iop->language ());
-	}
-	shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
-	if (smpte) {
-		subtitle->set_subtitle_language (smpte->language().get_value_or (""));
-		_frame_rate = smpte->edit_rate().numerator;
+		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)));
+		subtitle->add_font (boost::make_shared<Font> (i->id));
 	}
 }
 
 DCPTime
 DCPSubtitleContent::full_length () const
 {
-	FrameRateChange const frc (subtitle_video_frame_rate(), film()->video_frame_rate());
+	FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
 	return DCPTime (_length, frc);
 }
 
@@ -102,33 +106,10 @@ DCPSubtitleContent::as_xml (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text ("DCPSubtitle");
 	Content::as_xml (node);
-	subtitle->as_xml (node);
-	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
-}
 
-void
-DCPSubtitleContent::set_subtitle_video_frame_rate (int r)
-{
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_frame_rate = r;
+	if (subtitle) {
+		subtitle->as_xml (node);
 	}
 
-	signal_changed (SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE);
-}
-
-double
-DCPSubtitleContent::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.
-	*/
-	return film()->active_frame_rate_change(position()).source;
+	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
 }