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_internal.h | |
| parent | ec82ce2d44d5ba492a3dfa6e740ff21549d438e1 (diff) | |
Rename Data -> ArrayData.
Diffstat (limited to 'src/subtitle_asset_internal.h')
| -rw-r--r-- | src/subtitle_asset_internal.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/subtitle_asset_internal.h b/src/subtitle_asset_internal.h index 366123c5..e5c8e141 100644 --- a/src/subtitle_asset_internal.h +++ b/src/subtitle_asset_internal.h @@ -34,10 +34,11 @@ #ifndef LIBDCP_SUBTITLE_ASSET_INTERNAL_H #define LIBDCP_SUBTITLE_ASSET_INTERNAL_H + +#include "array_data.h" #include "raw_convert.h" #include "types.h" #include "dcp_time.h" -#include "data.h" #include <libxml++/libxml++.h> #include <boost/foreach.hpp> @@ -167,7 +168,7 @@ private: class Image : public Part { public: - Image (boost::shared_ptr<Part> parent, std::string id, Data png_data, HAlign h_align, float h_position, VAlign v_align, float v_position) + Image (boost::shared_ptr<Part> parent, std::string id, ArrayData png_data, HAlign h_align, float h_position, VAlign v_align, float v_position) : Part (parent) , _png_data (png_data) , _id (id) @@ -180,7 +181,7 @@ public: xmlpp::Element* as_xml (xmlpp::Element* parent, Context& context) const; private: - Data _png_data; + ArrayData _png_data; std::string _id; ///< the ID of this image HAlign _h_align; float _h_position; |