X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsubtitle_asset.h;h=dff31cc69d91b78ee37d0077e89699c26cc667d8;hb=3924dd859ad3de1d4a207d04e841f699bd27490a;hp=b66e88b10706379f1fe84cfe47e3687c3bba5c56;hpb=02d5b8c73ca3d8d18397658425b0e8f2d5e4e90a;p=libdcp.git

diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index b66e88b1..dff31cc6 100644
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -34,10 +34,11 @@
 #ifndef LIBDCP_SUBTITLE_ASSET_H
 #define LIBDCP_SUBTITLE_ASSET_H
 
+
+#include "array_data.h"
 #include "asset.h"
 #include "dcp_time.h"
 #include "subtitle_string.h"
-#include "data.h"
 #include <libcxml/cxml.h>
 #include <boost/shared_array.hpp>
 #include <map>
@@ -82,19 +83,19 @@ public:
 	explicit SubtitleAsset (boost::filesystem::path file);
 
 	bool equals (
-		boost::shared_ptr<const Asset>,
+		std::shared_ptr<const Asset>,
 		EqualityOptions,
 		NoteHandler note
 		) const;
 
-	std::list<boost::shared_ptr<Subtitle> > subtitles_during (Time from, Time to, bool starting) const;
-	std::list<boost::shared_ptr<Subtitle> > const & subtitles () const {
+	std::list<std::shared_ptr<Subtitle> > subtitles_during (Time from, Time to, bool starting) const;
+	std::list<std::shared_ptr<Subtitle> > const & subtitles () const {
 		return _subtitles;
 	}
 
-	virtual void add (boost::shared_ptr<Subtitle>);
-	virtual void add_font (std::string id, boost::filesystem::path file) = 0;
-	std::map<std::string, Data> font_data () const;
+	virtual void add (std::shared_ptr<Subtitle>);
+	virtual void add_font (std::string id, dcp::ArrayData data) = 0;
+	std::map<std::string, ArrayData> font_data () const;
 	std::map<std::string, boost::filesystem::path> font_filenames () const;
 
 	virtual void write (boost::filesystem::path) const = 0;
@@ -104,7 +105,7 @@ public:
 
 	void fix_empty_font_ids ();
 
-	virtual std::list<boost::shared_ptr<LoadFontNode> > load_font_nodes () const = 0;
+	virtual std::list<std::shared_ptr<LoadFontNode> > load_font_nodes () const = 0;
 
 	std::string raw_xml () const {
 		return _raw_xml;
@@ -151,7 +152,7 @@ protected:
 	void subtitles_as_xml (xmlpp::Element* root, int time_code_rate, Standard standard) const;
 
 	/** All our subtitles, in no particular order */
-	std::list<boost::shared_ptr<Subtitle> > _subtitles;
+	std::list<std::shared_ptr<Subtitle> > _subtitles;
 
 	class Font
 	{
@@ -163,7 +164,7 @@ protected:
 			, file (file_)
 		{}
 
-		Font (std::string load_id_, std::string uuid_, Data data_)
+		Font (std::string load_id_, std::string uuid_, ArrayData data_)
 			: load_id (load_id_)
 			, uuid (uuid_)
 			, data (data_)
@@ -171,7 +172,7 @@ protected:
 
 		std::string load_id;
 		std::string uuid;
-		Data data;
+		ArrayData data;
 		/** .ttf file that this data was last written to, if applicable */
 		mutable boost::optional<boost::filesystem::path> file;
 	};
@@ -189,7 +190,7 @@ private:
 
 	void maybe_add_subtitle (std::string text, std::list<ParseState> const & parse_state, Standard standard);
 
-	static void pull_fonts (boost::shared_ptr<order::Part> part);
+	static void pull_fonts (std::shared_ptr<order::Part> part);
 };
 
 }