summaryrefslogtreecommitdiff
path: root/src/subtitle_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-12-27 20:35:19 +0000
committerCarl Hetherington <cth@carlh.net>2014-12-27 20:35:19 +0000
commitd6633a73369339c419f33fb9d641f342826a3290 (patch)
tree7909203ea854f7039b62074004df92bec7aec796 /src/subtitle_content.cc
parent6f125b65d1bc0650735624d7ada17a2ff573cbc4 (diff)
Rename color -> colour.
Diffstat (limited to 'src/subtitle_content.cc')
-rw-r--r--src/subtitle_content.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/subtitle_content.cc b/src/subtitle_content.cc
index 592bfc62..1b5e6a1b 100644
--- a/src/subtitle_content.cc
+++ b/src/subtitle_content.cc
@@ -132,7 +132,7 @@ SubtitleContent::maybe_add_subtitle (string text, ParseState const & parse_state
SubtitleString (
effective_font.id,
effective_font.italic.get(),
- effective_font.color.get(),
+ effective_font.colour.get(),
effective_font.size,
effective_subtitle.in,
effective_subtitle.out,
@@ -140,7 +140,7 @@ SubtitleContent::maybe_add_subtitle (string text, ParseState const & parse_state
effective_text.v_align,
text,
effective_font.effect ? effective_font.effect.get() : NONE,
- effective_font.effect_color.get(),
+ effective_font.effect_colour.get(),
effective_subtitle.fade_up_time,
effective_subtitle.fade_down_time
)