diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-10-30 00:50:57 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-11-02 00:12:56 +0100 |
| commit | da15bff6e278d351301c9c50a4c96737ae4b5545 (patch) | |
| tree | 86057f3d8cbca41130fe170791ef341e18bc6283 /src/subtitle_asset.h | |
| parent | ec82ce2d44d5ba492a3dfa6e740ff21549d438e1 (diff) | |
Rename Data -> ArrayData.
Diffstat (limited to 'src/subtitle_asset.h')
| -rw-r--r-- | src/subtitle_asset.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h index b66e88b1..063a2dfd 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> @@ -94,7 +95,7 @@ public: 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; + 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; @@ -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; }; |