diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-03 16:09:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-03 16:09:24 +0100 |
| commit | 4b0ece8d964961598ce4734ce25bb0aed66dbf7a (patch) | |
| tree | e13cc114733d155353e8e20c73d96627a5ceb1a0 /src/subtitle_content.cc | |
| parent | 5e4c87ae58f1ed73b9ef19cd75210963599fa546 (diff) | |
Add AspectAdjust to subtitles.
Diffstat (limited to 'src/subtitle_content.cc')
| -rw-r--r-- | src/subtitle_content.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/subtitle_content.cc b/src/subtitle_content.cc index f8321273..1977861e 100644 --- a/src/subtitle_content.cc +++ b/src/subtitle_content.cc @@ -131,16 +131,17 @@ SubtitleContent::maybe_add_subtitle (string text, ParseState const & parse_state _subtitles.push_back ( SubtitleString ( effective_font.id, - effective_font.italic.get(), - effective_font.colour.get(), + effective_font.italic.get_value_or (false), + effective_font.colour.get_value_or (dcp::Colour (255, 255, 255)), effective_font.size, + effective_font.aspect_adjust.get_value_or (1.0), effective_subtitle.in, effective_subtitle.out, effective_text.v_position, effective_text.v_align, text, - effective_font.effect ? effective_font.effect.get() : NONE, - effective_font.effect_colour.get(), + effective_font.effect.get_value_or (NONE), + effective_font.effect_colour.get_value_or (dcp::Colour (0, 0, 0)), effective_subtitle.fade_up_time, effective_subtitle.fade_down_time ) |