X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftext_content.cc;h=901d38647c05bdd20504c8ce6e69e893c56fd1ad;hp=35dee525adf9c94827842e2376411e875279f5a1;hb=56caa542a558a3e261a3da4773c9ed3e66e262ab;hpb=1fe6bd7f8ba059322b8357b2210f0fd590567ce2

diff --git a/src/lib/text_content.cc b/src/lib/text_content.cc
index 35dee525a..901d38647 100644
--- a/src/lib/text_content.cc
+++ b/src/lib/text_content.cc
@@ -39,6 +39,7 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 int const TextContentProperty::X_OFFSET = 500;
 int const TextContentProperty::Y_OFFSET = 501;
@@ -56,6 +57,7 @@ int const TextContentProperty::FADE_IN = 512;
 int const TextContentProperty::FADE_OUT = 513;
 int const TextContentProperty::OUTLINE_WIDTH = 514;
 int const TextContentProperty::TYPE = 515;
+int const TextContentProperty::DCP_TRACK = 516;
 
 TextContent::TextContent (Content* parent, TextType type, TextType original_type)
 	: ContentPart (parent)
@@ -66,7 +68,7 @@ TextContent::TextContent (Content* parent, TextType type, TextType original_type
 	, _x_scale (1)
 	, _y_scale (1)
 	, _line_spacing (1)
-	, _outline_width (2)
+	, _outline_width (4)
 	, _type (type)
 	, _original_type (original_type)
 {
@@ -107,6 +109,7 @@ TextContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version)
 	BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Text")) {
 		c.push_back (shared_ptr<TextContent> (new TextContent (parent, i, version)));
 	}
+
 	return c;
 }
 
@@ -119,7 +122,7 @@ TextContent::TextContent (Content* parent, cxml::ConstNodePtr node, int version)
 	, _x_scale (1)
 	, _y_scale (1)
 	, _line_spacing (node->optional_number_child<double>("LineSpacing").get_value_or (1))
-	, _outline_width (node->optional_number_child<int>("OutlineWidth").get_value_or (2))
+	, _outline_width (node->optional_number_child<int>("OutlineWidth").get_value_or (4))
 	, _type (TEXT_OPEN_SUBTITLE)
 	, _original_type (TEXT_OPEN_SUBTITLE)
 {
@@ -231,6 +234,11 @@ TextContent::TextContent (Content* parent, cxml::ConstNodePtr node, int version)
 			_original_type = string_to_text_type (node->optional_string_child("OriginalType").get());
 		}
 	}
+
+	cxml::ConstNodePtr dt = node->optional_node_child("DCPTrack");
+	if (dt) {
+		_dcp_track = DCPTextTrack (dt);
+	}
 }
 
 TextContent::TextContent (Content* parent, vector<shared_ptr<Content> > c)
@@ -286,6 +294,10 @@ TextContent::TextContent (Content* parent, vector<shared_ptr<Content> > c)
 			throw JoinError (_("Content to be joined must use the same fonts."));
 		}
 
+		if (c[i]->only_text()->dcp_track() != ref->dcp_track()) {
+			throw JoinError (_("Content to be joined must use the same DCP track."));
+		}
+
 		list<shared_ptr<Font> >::const_iterator j = ref_fonts.begin ();
 		list<shared_ptr<Font> >::const_iterator k = fonts.begin ();
 
@@ -312,6 +324,7 @@ TextContent::TextContent (Content* parent, vector<shared_ptr<Content> > c)
 	_outline_width = ref->outline_width ();
 	_type = ref->type ();
 	_original_type = ref->original_type ();
+	_dcp_track = ref->dcp_track ();
 
 	connect_to_fonts ();
 }
@@ -369,6 +382,9 @@ TextContent::as_xml (xmlpp::Node* root) const
 
 	text->add_child("Type")->add_child_text (text_type_to_string(_type));
 	text->add_child("OriginalType")->add_child_text (text_type_to_string(_original_type));
+	if (_dcp_track) {
+		_dcp_track->as_xml(text->add_child("DCPTrack"));
+	}
 }
 
 string
@@ -384,18 +400,17 @@ TextContent::identifier () const
 		+ "_" + raw_convert<string> (outline_width())
 		+ "_" + raw_convert<string> (colour().get_value_or(dcp::Colour(255, 255, 255)).to_argb_string())
 		+ "_" + raw_convert<string> (dcp::effect_to_string(effect().get_value_or(dcp::NONE)))
-		+ "_" + raw_convert<string> (effect_colour().get_value_or(dcp::Colour(0, 0, 0)).to_argb_string());
+		+ "_" + raw_convert<string> (effect_colour().get_value_or(dcp::Colour(0, 0, 0)).to_argb_string())
+		+ "_" + raw_convert<string> (_parent->video_frame_rate().get_value_or(0));
 
 	/* XXX: I suppose really _fonts shouldn't be in here, since not all
 	   types of subtitle content involve fonts.
 	*/
 	BOOST_FOREACH (shared_ptr<Font> f, _fonts) {
-		for (int i = 0; i < FontFiles::VARIANTS; ++i) {
-			s += "_" + f->file(static_cast<FontFiles::Variant>(i)).get_value_or("Default").string();
-		}
+		s += "_" + f->file().get_value_or("Default").string();
 	}
 
-	/* The language is for metadata only, and doesn't affect
+	/* The DCP track and language are for metadata only, and don't affect
 	   how this content looks.
 	*/
 
@@ -427,7 +442,7 @@ void
 TextContent::font_changed ()
 {
 	/* XXX: too late */
-	ContentChange cc (_parent, TextContentProperty::FONTS);
+	ChangeSignaller<Content> cc (_parent, TextContentProperty::FONTS);
 }
 
 void
@@ -550,6 +565,18 @@ TextContent::set_outline_width (int w)
 	maybe_set (_outline_width, w, TextContentProperty::OUTLINE_WIDTH);
 }
 
+void
+TextContent::set_dcp_track (DCPTextTrack t)
+{
+	maybe_set (_dcp_track, t, TextContentProperty::DCP_TRACK);
+}
+
+void
+TextContent::unset_dcp_track ()
+{
+	maybe_set (_dcp_track, optional<DCPTextTrack>(), TextContentProperty::DCP_TRACK);
+}
+
 void
 TextContent::take_settings_from (shared_ptr<const TextContent> c)
 {
@@ -581,4 +608,9 @@ TextContent::take_settings_from (shared_ptr<const TextContent> c)
 		set_fade_out (*c->_fade_out);
 	}
 	set_outline_width (c->_outline_width);
+	if (c->_dcp_track) {
+		set_dcp_track (c->_dcp_track.get());
+	} else {
+		unset_dcp_track ();
+	}
 }