X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ftext_subtitle_content.cc;h=08722a065d0f66bdfdce8e907cf0c4603b4075fa;hb=58b5c57c9a4767c786a1428f243c60ff52c82c26;hp=37ad5649aec353faa2a37070b71c5519a0dddfe2;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/text_subtitle_content.cc b/src/lib/text_subtitle_content.cc
index 37ad5649a..08722a065 100644
--- a/src/lib/text_subtitle_content.cc
+++ b/src/lib/text_subtitle_content.cc
@@ -23,8 +23,8 @@
 #include "text_subtitle.h"
 #include "film.h"
 #include "font.h"
-#include "raw_convert.h"
 #include "subtitle_content.h"
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 #include <iostream>
 
@@ -33,8 +33,7 @@
 using std::string;
 using std::cout;
 using boost::shared_ptr;
-
-std::string const TextSubtitleContent::font_id = "font";
+using dcp::raw_convert;
 
 TextSubtitleContent::TextSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
 	: Content (film, path)
@@ -60,7 +59,7 @@ TextSubtitleContent::examine (boost::shared_ptr<Job> job)
 
 	boost::mutex::scoped_lock lm (_mutex);
 	_length = s.length ();
-	subtitle->add_font (shared_ptr<Font> (new Font (font_id)));
+	subtitle->add_font (shared_ptr<Font> (new Font (TEXT_FONT_ID)));
 }
 
 string
@@ -76,10 +75,10 @@ TextSubtitleContent::technical_summary () const
 }
 
 void
-TextSubtitleContent::as_xml (xmlpp::Node* node) const
+TextSubtitleContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
 	node->add_child("Type")->add_child_text ("TextSubtitle");
-	Content::as_xml (node);
+	Content::as_xml (node, with_paths);
 
 	if (subtitle) {
 		subtitle->as_xml (node);