projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch to testing on Ubuntu 16.04 and 22.04.
[libdcp.git]
/
src
/
subtitle_string.h
diff --git
a/src/subtitle_string.h
b/src/subtitle_string.h
index 0ffa6ec5b5a612fad2668f0bcbda33b2f99694a8..4eb64a68a1e6ef0e9c95d6dcd28a4ec3dc7e3c39 100644
(file)
--- a/
src/subtitle_string.h
+++ b/
src/subtitle_string.h
@@
-41,9
+41,8
@@
#define LIBDCP_SUBTITLE_STRING_H
#define LIBDCP_SUBTITLE_STRING_H
-#include "types.h"
-#include "subtitle.h"
#include "dcp_time.h"
#include "dcp_time.h"
+#include "subtitle.h"
#include <boost/optional.hpp>
#include <string>
#include <boost/optional.hpp>
#include <string>
@@
-70,6
+69,8
@@
public:
* @param h_align Horizontal alignment point
* @param v_position Vertical position as a fraction of the screen height (between 0 and 1) from v_align
* @param v_align Vertical alignment point
* @param h_align Horizontal alignment point
* @param v_position Vertical position as a fraction of the screen height (between 0 and 1) from v_align
* @param v_align Vertical alignment point
+ * @param z_position Z position as a proportion of the primary picture width between -1 and +1;
+ * +ve moves the image away from the viewer, -ve moves it toward the viewer, 0 is in the plane of the screen.
* @param direction Direction of text
* @param text The text to display
* @param effect Effect to use
* @param direction Direction of text
* @param text The text to display
* @param effect Effect to use
@@
-92,6
+93,7
@@
public:
HAlign h_align,
float v_position,
VAlign v_align,
HAlign h_align,
float v_position,
VAlign v_align,
+ float z_position,
Direction direction,
std::string text,
Effect effect,
Direction direction,
std::string text,
Effect effect,
@@
-188,7
+190,7
@@
public:
_effect_colour = c;
}
_effect_colour = c;
}
- bool equals(std::shared_ptr<const dcp::Subtitle> other_sub, EqualityOptions options, NoteHandler node) const override;
+ bool equals(std::shared_ptr<const dcp::Subtitle> other_sub, EqualityOptions
const&
options, NoteHandler node) const override;
private:
/** font ID */
private:
/** font ID */