Switch subtitle string font specs to be the font ID; split SubtitleContent into Interop and SMPTE.

1 files changed, 6 insertions, 194 deletions

diff --git a/src/subtitle_content.cc b/src/subtitle_content.cc
index 4f83d5bd..7bc080b3 100644
--- a/src/subtitle_content.cc
+++ b/src/subtitle_content.cc
@@ -23,7 +23,6 @@
 #include "xml.h"
 #include "font.h"
 #include "text.h"
-#include "load_font.h"
 #include "subtitle_string.h"
 #include "AS_DCP.h"
 #include "KM_util.h"
@@ -41,71 +40,26 @@ using boost::shared_ptr;
 using boost::optional;
 using namespace dcp;
 
-SubtitleContent::SubtitleContent (boost::filesystem::path file, bool mxf)
+SubtitleContent::SubtitleContent (boost::filesystem::path file)
 	: Content (file)
 {
-	shared_ptr<cxml::Document> xml;
-	
-	if (mxf) {
-		ASDCP::TimedText::MXFReader reader;
-		Kumu::Result_t r = reader.OpenRead (file.string().c_str ());
-		if (ASDCP_FAILURE (r)) {
-			boost::throw_exception (MXFFileError ("could not open MXF file for reading", file, r));
-		}
-		
-		string s;
-		reader.ReadTimedTextResource (s, 0, 0);
-		xml.reset (new cxml::Document ("SubtitleReel"));
-		stringstream t;
-		t << s;
-		xml->read_stream (t);
-
-		ASDCP::WriterInfo info;
-		reader.FillWriterInfo (info);
-		
-		char buffer[64];
-		Kumu::bin2UUIDhex (info.AssetUUID, ASDCP::UUIDlen, buffer, sizeof (buffer));
-		_id = buffer;
-
-	} else {
-		xml.reset (new cxml::Document ("DCSubtitle"));
-		xml->read_file (file);
-		_id = xml->string_child ("SubtitleID");
-	}
 
-	/* XXX: hacks aplenty in here; probably need separate parsers for DCSubtitle and SubtitleReel */
+}
 
-	_movie_title = xml->optional_string_child ("MovieTitle");
+void
+SubtitleContent::parse_common (shared_ptr<cxml::Document> xml, list<shared_ptr<dcp::Font> > font_nodes)
+{
 	_reel_number = xml->string_child ("ReelNumber");
 	_language = xml->string_child ("Language");
 
-	xml->ignore_child ("LoadFont");
-
-	list<shared_ptr<dcp::Font> > font_nodes = type_children<dcp::Font> (xml, "Font");
-	_load_font_nodes = type_children<dcp::LoadFont> (xml, "LoadFont");
-
 	/* Now make Subtitle objects to represent the raw XML nodes
 	   in a sane way.
 	*/
 
-	shared_ptr<cxml::Node> subtitle_list = xml->optional_node_child ("SubtitleList");
-	if (subtitle_list) {
-		list<shared_ptr<dcp::Font> > font = type_children<dcp::Font> (subtitle_list, "Font");
-		copy (font.begin(), font.end(), back_inserter (font_nodes));
-	}
-	
 	ParseState parse_state;
 	examine_font_nodes (xml, font_nodes, parse_state);
 }
 
-SubtitleContent::SubtitleContent (string movie_title, string language)
-	: _movie_title (movie_title)
-	, _reel_number ("1")
-	, _language (language)
-{
-
-}
-
 void
 SubtitleContent::examine_font_nodes (
 	shared_ptr<const cxml::Node> xml,
@@ -167,7 +121,7 @@ SubtitleContent::maybe_add_subtitle (string text, ParseState const & parse_state
 
 	_subtitles.push_back (
 		SubtitleString (
-			font_id_to_name (effective_font.id),
+			effective_font.id,
 			effective_font.italic.get(),
 			effective_font.color.get(),
 			effective_font.size,
@@ -197,40 +151,12 @@ SubtitleContent::subtitles_at (Time t) const
 	return s;
 }
 
-std::string
-SubtitleContent::font_id_to_name (string id) const
-{
-	list<shared_ptr<dcp::LoadFont> >::const_iterator i = _load_font_nodes.begin();
-	while (i != _load_font_nodes.end() && (*i)->id != id) {
-		++i;
-	}
-
-	if (i == _load_font_nodes.end ()) {
-		return "";
-	}
-
-	if ((*i)->uri && (*i)->uri.get() == "arial.ttf") {
-		return "Arial";
-	}
-
-	return "";
-}
-
 void
 SubtitleContent::add (SubtitleString s)
 {
 	_subtitles.push_back (s);
 }
 
-struct SubtitleSorter {
-	bool operator() (SubtitleString const & a, SubtitleString const & b) {
-		if (a.in() != b.in()) {
-			return a.in() < b.in();
-		}
-		return a.v_position() < b.v_position();
-	}
-};
-
 void
 SubtitleContent::write_xml (boost::filesystem::path p) const
 {
@@ -246,120 +172,6 @@ SubtitleContent::write_xml (boost::filesystem::path p) const
 	_file = p;
 }
 
-Glib::ustring
-SubtitleContent::xml_as_string () const
-{
-	xmlpp::Document doc;
-	xmlpp::Element* root = doc.create_root_node ("DCSubtitle");
-	root->set_attribute ("Version", "1.0");
-
-	root->add_child("SubtitleID")->add_child_text (_id);
-	if (_movie_title) {
-		root->add_child("MovieTitle")->add_child_text (_movie_title.get ());
-	}
-	root->add_child("ReelNumber")->add_child_text (raw_convert<string> (_reel_number));
-	root->add_child("Language")->add_child_text (_language);
-
-	if (_load_font_nodes.size() > 1) {
-		boost::throw_exception (MiscError ("multiple LoadFont nodes not supported"));
-	}
-
-	if (!_load_font_nodes.empty ()) {
-		xmlpp::Element* load_font = root->add_child("LoadFont");
-		load_font->set_attribute ("Id", _load_font_nodes.front()->id);
-		if (_load_font_nodes.front()->uri) {
-			load_font->set_attribute ("URI", _load_font_nodes.front()->uri.get ());
-		}
-	}
-
-	list<SubtitleString> sorted = _subtitles;
-	sorted.sort (SubtitleSorter ());
-
-	/* XXX: multiple fonts not supported */
-	/* XXX: script, underlined, weight not supported */
-
-	bool italic = false;
-	Color color;
-	int size = 0;
-	Effect effect = NONE;
-	Color effect_color;
-	int spot_number = 1;
-	Time last_in;
-	Time last_out;
-	Time last_fade_up_time;
-	Time last_fade_down_time;
-
-	xmlpp::Element* font = 0;
-	xmlpp::Element* subtitle = 0;
-
-	for (list<SubtitleString>::iterator i = sorted.begin(); i != sorted.end(); ++i) {
-
-		/* We will start a new <Font>...</Font> whenever some font property changes.
-		   I suppose we should really make an optimal hierarchy of <Font> tags, but
-		   that seems hard.
-		*/
-
-		bool const font_changed =
-			italic       != i->italic()       ||
-			color        != i->color()        ||
-			size         != i->size()         ||
-			effect       != i->effect()       ||
-			effect_color != i->effect_color();
-
-		if (font_changed) {
-			italic = i->italic ();
-			color = i->color ();
-			size = i->size ();
-			effect = i->effect ();
-			effect_color = i->effect_color ();
-		}
-
-		if (!font || font_changed) {
-			font = root->add_child ("Font");
-			string id = "theFontId";
-			if (!_load_font_nodes.empty()) {
-				id = _load_font_nodes.front()->id;
-			}
-			font->set_attribute ("Id", id);
-			font->set_attribute ("Italic", italic ? "yes" : "no");
-			font->set_attribute ("Color", color.to_argb_string());
-			font->set_attribute ("Size", raw_convert<string> (size));
-			font->set_attribute ("Effect", effect_to_string (effect));
-			font->set_attribute ("EffectColor", effect_color.to_argb_string());
-			font->set_attribute ("Script", "normal");
-			font->set_attribute ("Underlined", "no");
-			font->set_attribute ("Weight", "normal");
-		}
-
-		if (!subtitle || font_changed ||
-		    (last_in != i->in() ||
-		     last_out != i->out() ||
-		     last_fade_up_time != i->fade_up_time() ||
-		     last_fade_down_time != i->fade_down_time()
-			    )) {
-
-			subtitle = font->add_child ("Subtitle");
-			subtitle->set_attribute ("SpotNumber", raw_convert<string> (spot_number++));
-			subtitle->set_attribute ("TimeIn", i->in().to_string());
-			subtitle->set_attribute ("TimeOut", i->out().to_string());
-			subtitle->set_attribute ("FadeUpTime", raw_convert<string> (i->fade_up_time().to_ticks()));
-			subtitle->set_attribute ("FadeDownTime", raw_convert<string> (i->fade_down_time().to_ticks()));
-
-			last_in = i->in ();
-			last_out = i->out ();
-			last_fade_up_time = i->fade_up_time ();
-			last_fade_down_time = i->fade_down_time ();
-		}
-
-		xmlpp::Element* text = subtitle->add_child ("Text");
-		text->set_attribute ("VAlign", valign_to_string (i->v_align()));		
-		text->set_attribute ("VPosition", raw_convert<string> (i->v_position()));
-		text->add_child_text (i->text());
-	}
-
-	return doc.write_to_string_formatted ("UTF-8");
-}
-
 Time
 SubtitleContent::latest_subtitle_out () const
 {