X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsubtitle.h;h=1ca3f9d449d02c556412e9d6d588a4f2cee7706e;hb=0eff1f460e187c5d0e3f3829a266d8dc9ee000db;hp=2a8e0322c99ffdefbf9abcc6b119606faecc6c79;hpb=504c7ba026dff76f4124effef01f36a528a04bec;p=libdcp.git

diff --git a/src/subtitle.h b/src/subtitle.h
index 2a8e0322..1ca3f9d4 100644
--- a/src/subtitle.h
+++ b/src/subtitle.h
@@ -42,11 +42,16 @@
 
 
 #include "dcp_time.h"
+#include "h_align.h"
+#include "v_align.h"
 
 
 namespace dcp {
 
 
+class EqualityOptions;
+
+
 class Subtitle
 {
 public:
@@ -82,6 +87,10 @@ public:
 		return _v_align;
 	}
 
+	float z_position() const {
+		return _z_position;
+	}
+
 	Time fade_up_time () const {
 		return _fade_up_time;
 	}
@@ -109,6 +118,10 @@ public:
 		_v_position = p;
 	}
 
+	void set_z_position(float z) {
+		_z_position = z;
+	}
+
 	void set_fade_up_time (Time t) {
 		_fade_up_time = t;
 	}
@@ -117,7 +130,7 @@ public:
 		_fade_down_time = t;
 	}
 
-	virtual bool equals(std::shared_ptr<const dcp::Subtitle> other, EqualityOptions options, NoteHandler note) const;
+	virtual bool equals(std::shared_ptr<const dcp::Subtitle> other, EqualityOptions const& options, NoteHandler note) const;
 
 protected:
 
@@ -128,6 +141,7 @@ protected:
 		HAlign h_align,
 		float v_position,
 		VAlign v_align,
+		float z_position,
 		Time fade_up_time,
 		Time fade_down_time
 		);
@@ -144,6 +158,7 @@ protected:
 	 */
 	float _v_position = 0;
 	VAlign _v_align = VAlign::CENTER;
+	float _z_position = 0;
 	Time _fade_up_time;
 	Time _fade_down_time;
 };