projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add direction support for SMPTE subtitles; fix pragma warnings with non-openmp builds.
[libdcp.git]
/
src
/
subtitle_string.h
diff --git
a/src/subtitle_string.h
b/src/subtitle_string.h
index bd71b8da6b93e09c96f16651e31e714ddeb54abe..6cf1713dc2c4f370644dce277906df9f0e55acdb 100644
(file)
--- a/
src/subtitle_string.h
+++ b/
src/subtitle_string.h
@@
-50,6
+50,7
@@
public:
HAlign h_align,
float v_position,
VAlign v_align,
HAlign h_align,
float v_position,
VAlign v_align,
+ Direction direction,
std::string text,
Effect effect,
Colour effect_colour,
std::string text,
Effect effect,
Colour effect_colour,
@@
-106,6
+107,10
@@
public:
return _v_align;
}
return _v_align;
}
+ Direction direction () const {
+ return _direction;
+ }
+
Effect effect () const {
return _effect;
}
Effect effect () const {
return _effect;
}
@@
-189,6
+194,7
@@
private:
*/
float _v_position;
VAlign _v_align;
*/
float _v_position;
VAlign _v_align;
+ Direction _direction;
std::string _text;
Effect _effect;
Colour _effect_colour;
std::string _text;
Effect _effect;
Colour _effect_colour;