X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Finterop_subtitle_asset.h;h=fe38a0c9916b5eb84676fa87cb5eafe494ca3b2b;hb=273fd9a4f1b43ae0de0071e5efd3b6347b166ff1;hp=4d2c2893196964a2e2f7bd238d691d546970af2d;hpb=5c1b079a28941781c9cfa46d57e0c20b55681b32;p=libdcp.git

diff --git a/src/interop_subtitle_asset.h b/src/interop_subtitle_asset.h
index 4d2c2893..fe38a0c9 100644
--- a/src/interop_subtitle_asset.h
+++ b/src/interop_subtitle_asset.h
@@ -47,9 +47,9 @@ public:
 
 	std::list<boost::shared_ptr<LoadFontNode> > load_font_nodes () const;
 
-	void add_font (std::string id, boost::filesystem::path file);
-	
-	Glib::ustring xml_as_string () const;
+	void add_font (std::string load_id, boost::filesystem::path file);
+
+	std::string xml_as_string () const;
 	void write (boost::filesystem::path path) const;
 	void resolve_fonts (std::list<boost::shared_ptr<Object> > objects);
 	void add_font_assets (std::list<boost::shared_ptr<Asset> >& assets);
@@ -92,7 +92,7 @@ public:
 	}
 
 protected:
-	
+
 	std::string pkl_type (Standard) const {
 		return "text/xml";
 	}