summaryrefslogtreecommitdiff
path: root/src/subtitle_image.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-10-30 00:50:57 +0100
committerCarl Hetherington <cth@carlh.net>2020-11-02 00:12:56 +0100
commitda15bff6e278d351301c9c50a4c96737ae4b5545 (patch)
tree86057f3d8cbca41130fe170791ef341e18bc6283 /src/subtitle_image.h
parentec82ce2d44d5ba492a3dfa6e740ff21549d438e1 (diff)
Rename Data -> ArrayData.
Diffstat (limited to 'src/subtitle_image.h')
-rw-r--r--src/subtitle_image.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/subtitle_image.h b/src/subtitle_image.h
index 3c4b3fe8..76c34765 100644
--- a/src/subtitle_image.h
+++ b/src/subtitle_image.h
@@ -38,9 +38,10 @@
#ifndef LIBDCP_SUBTITLE_IMAGE_H
#define LIBDCP_SUBTITLE_IMAGE_H
+
+#include "array_data.h"
#include "types.h"
#include "subtitle.h"
-#include "data.h"
#include "dcp_time.h"
#include <boost/optional.hpp>
#include <string>
@@ -54,7 +55,7 @@ class SubtitleImage : public Subtitle
{
public:
SubtitleImage (
- Data png_image,
+ ArrayData png_image,
Time in,
Time out,
float h_position,
@@ -66,7 +67,7 @@ public:
);
SubtitleImage (
- Data png_image,
+ ArrayData png_image,
std::string id,
Time in,
Time out,
@@ -78,11 +79,11 @@ public:
Time fade_down_time
);
- Data png_image () const {
+ ArrayData png_image () const {
return _png_image;
}
- void set_png_image (Data png) {
+ void set_png_image (ArrayData png) {
_png_image = png;
}
@@ -99,7 +100,7 @@ public:
}
private:
- Data _png_image;
+ ArrayData _png_image;
std::string _id;
mutable boost::optional<boost::filesystem::path> _file;
};