summaryrefslogtreecommitdiff
path: root/tools
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 /tools
parent6f125b65d1bc0650735624d7ada17a2ff573cbc4 (diff)
Rename color -> colour.
Diffstat (limited to 'tools')
-rw-r--r--tools/dcpinfo.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index 0bf0df08..1ebc4d95 100644
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -87,13 +87,13 @@ main_subtitle (shared_ptr<Reel> reel, bool list_subtitles)
cout << " "
<< "font:" << k->font().get_value_or("[default]") << "; "
<< "italic:" << k->italic() << "; "
- << "color:" << k->color() << "; "
+ << "color:" << k->colour() << "; "
<< "in:" << k->in() << "; "
<< "out:" << k->out() << "; "
<< "v_position:" << k->v_position() << "; "
<< "v_align:" << k->v_align() << "; "
<< "effect:" << k->effect() << "; "
- << "effect_color:" << k->effect_color() << "; "
+ << "effect_color:" << k->effect_colour() << "; "
<< "fade_up_time:" << k->fade_up_time() << "; "
<< "fade_down_time:" << k->fade_down_time() << "; "
<< "size: " << k->size() << "\n";