Rename color -> colour.

diff --git a/src/colour_matrix.cc b/src/colour_matrix.cc
index 72f952c3fbf888b84336bdeff5948629aeef19fb..1a99732622568b22e064c9ef37f09f7a7f604be7 100644 (file)
--- a/src/colour_matrix.cc
+++ b/src/colour_matrix.cc
@@ -19,7 +19,7 @@
 
 #include "colour_matrix.h"
 
-/* sRGB color matrix for XYZ -> RGB.  This is the same as the one used by the Fraunhofer
+/* sRGB colour matrix for XYZ -> RGB.  This is the same as the one used by the Fraunhofer
    EasyDCP player, I think.
 */
 

diff --git a/src/font.cc b/src/font.cc
index f43e83dff7d1e0fef9ccb1cbf456888e01e3f324..99f49f90436b3223bdb0a8cc9b51514016c8cd48 100644 (file)
--- a/src/font.cc
+++ b/src/font.cc
@@ -39,7 +39,7 @@ Font::Font (boost::shared_ptr<const cxml::Node> node)
        italic = node->optional_bool_attribute ("Italic");
        optional<string> c = node->optional_string_attribute ("Color");
        if (c) {
-               color = Color (c.get ());
+               colour = Colour (c.get ());
        }
        optional<string> const e = node->optional_string_attribute ("Effect");
        if (e) {
@@ -47,7 +47,7 @@ Font::Font (boost::shared_ptr<const cxml::Node> node)
        }
        c = node->optional_string_attribute ( "EffectColor");
        if (c) {
-               effect_color = Color (c.get ());
+               effect_colour = Colour (c.get ());
        }
        subtitle_nodes = type_children<Subtitle> (node, "Subtitle");
        font_nodes = type_children<Font> (node, "Font");
@@ -57,8 +57,8 @@ Font::Font (boost::shared_ptr<const cxml::Node> node)
 Font::Font (std::list<boost::shared_ptr<Font> > const & font_nodes)
        : size (0)
        , italic (false)
-       , color ("FFFFFFFF")
-       , effect_color ("FFFFFFFF")
+       , colour ("FFFFFFFF")
+       , effect_colour ("FFFFFFFF")
 {
        for (list<shared_ptr<Font> >::const_iterator i = font_nodes.begin(); i != font_nodes.end(); ++i) {
                if ((*i)->id) {
@@ -70,14 +70,14 @@ Font::Font (std::list<boost::shared_ptr<Font> > const & font_nodes)
                if ((*i)->italic) {
                        italic = (*i)->italic.get ();
                }
-               if ((*i)->color) {
-                       color = (*i)->color.get ();
+               if ((*i)->colour) {
+                       colour = (*i)->colour.get ();
                }
                if ((*i)->effect) {
                        effect = (*i)->effect.get ();
                }
-               if ((*i)->effect_color) {
-                       effect_color = (*i)->effect_color.get ();
+               if ((*i)->effect_colour) {
+                       effect_colour = (*i)->effect_colour.get ();
                }
        }
 }

diff --git a/src/font.h b/src/font.h
index 979166cd89ca476ec66e74e473f1d76e1e9051e9..d5ea5636ea75e162e7bde7feb262657b6b4762e7 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -50,9 +50,9 @@ public:
        boost::optional<std::string> id;
        int size;
        boost::optional<bool> italic;
-       boost::optional<Color> color;
+       boost::optional<Colour> colour;
        boost::optional<Effect> effect;
-       boost::optional<Color> effect_color;
+       boost::optional<Colour> effect_colour;
        
        std::list<boost::shared_ptr<Subtitle> > subtitle_nodes;
        std::list<boost::shared_ptr<Font> > font_nodes;

diff --git a/src/interop_subtitle_content.cc b/src/interop_subtitle_content.cc
index 0fdee0b427a538748ed5c1f91dff0146a2c7076e..09b30e99141e2d484d3cca2b14158045f6421d53 100644 (file)
--- a/src/interop_subtitle_content.cc
+++ b/src/interop_subtitle_content.cc
@@ -86,10 +86,10 @@ InteropSubtitleContent::xml_as_string () const
 
        optional<string> font;
        bool italic = false;
-       Color color;
+       Colour colour;
        int size = 0;
        Effect effect = NONE;
-       Color effect_color;
+       Colour effect_colour;
        int spot_number = 1;
        Time last_in;
        Time last_out;
@@ -109,18 +109,18 @@ InteropSubtitleContent::xml_as_string () const
                bool const font_changed =
                        font         != i->font()         ||
                        italic       != i->italic()       ||
-                       color        != i->color()        ||
+                       colour        != i->colour()        ||
                        size         != i->size()         ||
                        effect       != i->effect()       ||
-                       effect_color != i->effect_color();
+                       effect_colour != i->effect_colour();
 
                if (font_changed) {
                        font = i->font ();
                        italic = i->italic ();
-                       color = i->color ();
+                       colour = i->colour ();
                        size = i->size ();
                        effect = i->effect ();
-                       effect_color = i->effect_color ();
+                       effect_colour = i->effect_colour ();
                }
 
                if (!font_element || font_changed) {
@@ -129,10 +129,10 @@ InteropSubtitleContent::xml_as_string () const
                                font_element->set_attribute ("Id", font.get ());
                        }
                        font_element->set_attribute ("Italic", italic ? "yes" : "no");
-                       font_element->set_attribute ("Color", color.to_argb_string());
+                       font_element->set_attribute ("Color", colour.to_argb_string());
                        font_element->set_attribute ("Size", raw_convert<string> (size));
                        font_element->set_attribute ("Effect", effect_to_string (effect));
-                       font_element->set_attribute ("EffectColor", effect_color.to_argb_string());
+                       font_element->set_attribute ("EffectColor", effect_colour.to_argb_string());
                        font_element->set_attribute ("Script", "normal");
                        font_element->set_attribute ("Underlined", "no");
                        font_element->set_attribute ("Weight", "normal");

diff --git a/src/subtitle_content.cc b/src/subtitle_content.cc
index 592bfc627b870b69924cae38ae8b787ef3bfb59d..1b5e6a1b2e32447c0295a788682846d6fdb7852b 100644 (file)
--- 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
                        )

diff --git a/src/subtitle_string.cc b/src/subtitle_string.cc
index a92eac9240b30867ed663cb6a92e29be14f4de16..a8dfd555674c54f39bc571f21afd4d8e30b71c8b 100644 (file)
--- a/src/subtitle_string.cc
+++ b/src/subtitle_string.cc
@@ -28,7 +28,7 @@ using namespace dcp;
 SubtitleString::SubtitleString (
        optional<string> font,
        bool italic,
-       Color color,
+       Colour colour,
        int size,
        Time in,
        Time out,
@@ -36,13 +36,13 @@ SubtitleString::SubtitleString (
        VAlign v_align,
        string text,
        Effect effect,
-       Color effect_color,
+       Colour effect_colour,
        Time fade_up_time,
        Time fade_down_time
        )
        : _font (font)
        , _italic (italic)
-       , _color (color)
+       , _colour (colour)
        , _size (size)
        , _in (in)
        , _out (out)
@@ -50,7 +50,7 @@ SubtitleString::SubtitleString (
        , _v_align (v_align)
        , _text (text)
        , _effect (effect)
-       , _effect_color (effect_color)
+       , _effect_colour (effect_colour)
        , _fade_up_time (fade_up_time)
        , _fade_down_time (fade_down_time)
 {
@@ -74,7 +74,7 @@ dcp::operator== (SubtitleString const & a, SubtitleString const & b)
        return (
                a.font() == b.font() &&
                a.italic() == b.italic() &&
-               a.color() == b.color() &&
+               a.colour() == b.colour() &&
                a.size() == b.size() &&
                a.in() == b.in() &&
                a.out() == b.out() &&
@@ -82,7 +82,7 @@ dcp::operator== (SubtitleString const & a, SubtitleString const & b)
                a.v_align() == b.v_align() &&
                a.text() == b.text() &&
                a.effect() == b.effect() &&
-               a.effect_color() == b.effect_color() &&
+               a.effect_colour() == b.effect_colour() &&
                a.fade_up_time() == b.fade_up_time() &&
                a.fade_down_time() == b.fade_down_time()
                );
@@ -101,8 +101,8 @@ dcp::operator<< (ostream& s, SubtitleString const & sub)
                s << "non-italic";
        }
        
-       s << ", size " << sub.size() << ", color " << sub.color() << ", vpos " << sub.v_position() << ", valign " << ((int) sub.v_align()) << ";\n"
-         << "effect " << ((int) sub.effect()) << ", effect color " << sub.effect_color();
+       s << ", size " << sub.size() << ", colour " << sub.colour() << ", vpos " << sub.v_position() << ", valign " << ((int) sub.v_align()) << ";\n"
+         << "effect " << ((int) sub.effect()) << ", effect colour " << sub.effect_colour();
 
        return s;
 }

diff --git a/src/subtitle_string.h b/src/subtitle_string.h
index 512a1b5b3829fb2219fb569771f893175ad2d5f5..0f066164e6ccbf2b8e81cd6da5636ee91bfe3fc7 100644 (file)
--- a/src/subtitle_string.h
+++ b/src/subtitle_string.h
@@ -40,7 +40,7 @@ public:
        SubtitleString (
                boost::optional<std::string> font,
                bool italic,
-               Color color,
+               Colour colour,
                int size,
                Time in,
                Time out,
@@ -48,7 +48,7 @@ public:
                VAlign v_align,
                std::string text,
                Effect effect,
-               Color effect_color,
+               Colour effect_colour,
                Time fade_up_time,
                Time fade_down_time
                );
@@ -62,8 +62,8 @@ public:
                return _italic;
        }
 
-       Color color () const {
-               return _color;
+       Colour colour () const {
+               return _colour;
        }
 
        Time in () const {
@@ -93,8 +93,8 @@ public:
                return _effect;
        }
 
-       Color effect_color () const {
-               return _effect_color;
+       Colour effect_colour () const {
+               return _effect_colour;
        }
 
        Time fade_up_time () const {
@@ -128,7 +128,7 @@ private:
        /** true if the text is italic */
        bool _italic;
        /** text colour */
-       Color _color;
+       Colour _colour;
        /** Size in points as if the screen height is 11 inches, so a 72pt font
         *  would be 1/11th of the screen height.
         */ 
@@ -142,7 +142,7 @@ private:
        VAlign _v_align;
        std::string _text;
        Effect _effect;
-       Color _effect_color;
+       Colour _effect_colour;
        Time _fade_up_time;
        Time _fade_down_time;
 };

diff --git a/src/types.cc b/src/types.cc
index fc6d50f3e0dec5c56953061ed6cd6e12b07b3f97..c97fb7b402d3188857fea48d9b523c8585e13bd6 100644 (file)
--- a/src/types.cc
+++ b/src/types.cc
@@ -55,8 +55,8 @@ dcp::operator!= (Fraction const & a, Fraction const & b)
        return (a.numerator != b.numerator || a.denominator != b.denominator);
 }
 
-/** Construct a Color, initialising it to black. */
-Color::Color ()
+/** Construct a Colour, initialising it to black. */
+Colour::Colour ()
        : r (0)
        , g (0)
        , b (0)
@@ -64,10 +64,10 @@ Color::Color ()
 
 }
 
-/** Construct a Color from R, G and B.  The values run between
+/** Construct a Colour from R, G and B.  The values run between
  *  0 and 255.
  */
-Color::Color (int r_, int g_, int b_)
+Colour::Colour (int r_, int g_, int b_)
        : r (r_)
        , g (g_)
        , b (b_)
@@ -75,11 +75,11 @@ Color::Color (int r_, int g_, int b_)
 
 }
 
-/** Construct a Color from an ARGB hex string; the alpha value is ignored.
+/** Construct a Colour from an ARGB hex string; the alpha value is ignored.
  *  @param argb_hex A string of the form AARRGGBB, where e.g. RR is a two-character
  *  hex value.
  */
-Color::Color (string argb_hex)
+Colour::Colour (string argb_hex)
 {
        int alpha;
        if (sscanf (argb_hex.c_str(), "%2x%2x%2x%2x", &alpha, &r, &g, &b) < 4) {
@@ -91,7 +91,7 @@ Color::Color (string argb_hex)
  *  hex value.  The alpha value will always be FF (ie 255; maximum alpha).
  */
 string
-Color::to_argb_string () const
+Colour::to_argb_string () const
 {
        stringstream s;
        s << "FF";
@@ -105,28 +105,28 @@ Color::to_argb_string () const
        return t;
 }
 
-/** operator== for Colors.
- *  @param a First color to compare.
- *  @param b Second color to compare.
+/** operator== for Colours.
+ *  @param a First colour to compare.
+ *  @param b Second colour to compare.
  */
 bool
-dcp::operator== (Color const & a, Color const & b)
+dcp::operator== (Colour const & a, Colour const & b)
 {
        return (a.r == b.r && a.g == b.g && a.b == b.b);
 }
 
-/** operator!= for Colors.
- *  @param a First color to compare.
- *  @param b Second color to compare.
+/** operator!= for Colours.
+ *  @param a First colour to compare.
+ *  @param b Second colour to compare.
  */
 bool
-dcp::operator!= (Color const & a, Color const & b)
+dcp::operator!= (Colour const & a, Colour const & b)
 {
        return !(a == b);
 }
 
 ostream &
-dcp::operator<< (ostream& s, Color const & c)
+dcp::operator<< (ostream& s, Colour const & c)
 {
        s << "(" << c.r << ", " << c.g << ", " << c.b << ")";
        return s;

diff --git a/src/types.h b/src/types.h
index 98244891192b0ddb499ed12ee4235871de5614d8..f685806ffc77252507252c48b2c76501c671af59 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -164,15 +164,15 @@ enum Formulation {
        DCI_SPECIFIC
 };
 
-/** @class Color
- *  @brief An RGB color (aka colour).
+/** @class Colour
+ *  @brief An RGB colour.
  */
-class Color
+class Colour
 {
 public:
-       Color ();
-       Color (int r_, int g_, int b_);
-       Color (std::string argb_hex);
+       Colour ();
+       Colour (int r_, int g_, int b_);
+       Colour (std::string argb_hex);
 
        int r; ///< red component, from 0 to 255
        int g; ///< green component, from 0 to 255
@@ -181,9 +181,9 @@ public:
        std::string to_argb_string () const;
 };
 
-extern bool operator== (Color const & a, Color const & b);
-extern bool operator!= (Color const & a, Color const & b);
-extern std::ostream & operator<< (std::ostream & s, Color const & c);
+extern bool operator== (Colour const & a, Colour const & b);
+extern bool operator!= (Colour const & a, Colour const & b);
+extern std::ostream & operator<< (std::ostream & s, Colour const & c);
 
 typedef std::pair<std::string, boost::shared_ptr<const parse::AssetMap> > PathAssetMap;
 

diff --git a/test/color_test.cc b/test/color_test.cc
deleted file mode 100644 (file)
index d68f59d..0000000
--- a/test/color_test.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <boost/test/unit_test.hpp>
-
-#include "util.h"
-
-/* Check that dcp::Color works */
-BOOST_AUTO_TEST_CASE (color)
-{
-       dcp::Color c ("FFFF0000");
-
-       BOOST_CHECK_EQUAL (c.r, 255);
-       BOOST_CHECK_EQUAL (c.g, 0);
-       BOOST_CHECK_EQUAL (c.b, 0);
-       BOOST_CHECK_EQUAL (c.to_argb_string(), "FFFF0000");
-
-       c = dcp::Color ("FF00FF00");
-
-       BOOST_CHECK_EQUAL (c.r, 0);
-       BOOST_CHECK_EQUAL (c.g, 255);
-       BOOST_CHECK_EQUAL (c.b, 0);
-       BOOST_CHECK_EQUAL (c.to_argb_string(), "FF00FF00");
-
-       c = dcp::Color ("FF0000FF");
-
-       BOOST_CHECK_EQUAL (c.r, 0);
-       BOOST_CHECK_EQUAL (c.g, 0);
-       BOOST_CHECK_EQUAL (c.b, 255);
-       BOOST_CHECK_EQUAL (c.to_argb_string(), "FF0000FF");
-}

diff --git a/test/colour_test.cc b/test/colour_test.cc
new file mode 100644 (file)
index 0000000..5efccea
--- /dev/null
+++ b/test/colour_test.cc
@@ -0,0 +1,47 @@
+/*
+    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/test/unit_test.hpp>
+
+#include "util.h"
+
+/* Check that dcp::Colour works */
+BOOST_AUTO_TEST_CASE (colour)
+{
+       dcp::Colour c ("FFFF0000");
+
+       BOOST_CHECK_EQUAL (c.r, 255);
+       BOOST_CHECK_EQUAL (c.g, 0);
+       BOOST_CHECK_EQUAL (c.b, 0);
+       BOOST_CHECK_EQUAL (c.to_argb_string(), "FFFF0000");
+
+       c = dcp::Colour ("FF00FF00");
+
+       BOOST_CHECK_EQUAL (c.r, 0);
+       BOOST_CHECK_EQUAL (c.g, 255);
+       BOOST_CHECK_EQUAL (c.b, 0);
+       BOOST_CHECK_EQUAL (c.to_argb_string(), "FF00FF00");
+
+       c = dcp::Colour ("FF0000FF");
+
+       BOOST_CHECK_EQUAL (c.r, 0);
+       BOOST_CHECK_EQUAL (c.g, 0);
+       BOOST_CHECK_EQUAL (c.b, 255);
+       BOOST_CHECK_EQUAL (c.to_argb_string(), "FF0000FF");
+}

diff --git a/test/opendcp_lut.h b/test/opendcp_lut.h
index d8fbd930774a4eaadd6fab9176deb26b8a05f563..f25afd4c9e7f2ace9c27026f4ea01fad7db10356 100644 (file)
--- a/test/opendcp_lut.h
+++ b/test/opendcp_lut.h
@@ -49,7 +49,7 @@ enum LUT_OUT_ENUM {
     LO_MAX
 };
 
-extern float color_matrix[3][3][3];
+extern float colour_matrix[3][3][3];
 extern float lut_in[LI_MAX][4095+1];
 extern int lut_out[1][DCI_LUT_SIZE];
 

diff --git a/test/subtitle_tests.cc b/test/subtitle_tests.cc
index e8175cbbe5814503f02e11888a8914e9beb71ba1..c7137beca4cd7e9f1c6386aedfcd2678ec54f4df 100644 (file)
--- a/test/subtitle_tests.cc
+++ b/test/subtitle_tests.cc
@@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
        BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
                                   string ("theFontId"),
                                   false,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   39,
                                   dcp::Time (0, 0, 5, 198),
                                   dcp::Time (0, 0, 7, 115),
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
                                   dcp::BOTTOM,
                                   "My jacket was Idi Amin's",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 1),
                                   dcp::Time (0, 0, 0, 1)
                                   ));
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
        BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
                                   string ("theFontId"),
                                   true,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   39,
                                   dcp::Time (0, 0, 7, 177),
                                   dcp::Time (0, 0, 11, 31),
@@ -63,14 +63,14 @@ BOOST_AUTO_TEST_CASE (subtitles1)
                                   dcp::BOTTOM,
                                   "My corset was H.M. The Queen's",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 1),
                                   dcp::Time (0, 0, 0, 1)
                                   ));
        BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
                                   string ("theFontId"),
                                   false,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   39,
                                   dcp::Time (0, 0, 7, 177),
                                   dcp::Time (0, 0, 11, 31),
@@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
                                   dcp::BOTTOM,
                                   "My large wonderbra",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 1),
                                   dcp::Time (0, 0, 0, 1)
                                   ));
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
        BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
                                   string ("theFontId"),
                                   false,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   39,
                                   dcp::Time (0, 0, 11, 94),
                                   dcp::Time (0, 0, 13, 63),
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
                                   dcp::BOTTOM,
                                   "Once belonged to the Shah",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 1),
                                   dcp::Time (0, 0, 0, 1)
                                   ));
@@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
        BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
                                   string ("theFontId"),
                                   false,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   39,
                                   dcp::Time (0, 0, 13, 104),
                                   dcp::Time (0, 0, 15, 177),
@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
                                   dcp::BOTTOM,
                                   "And these are Roy Hattersley's jeans",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 1),
                                   dcp::Time (0, 0, 0, 1)
                                   ));
@@ -130,7 +130,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
        BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 0, 41, 62),
                                   dcp::Time (0, 0, 43, 52),
@@ -138,14 +138,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "At afternoon tea with John Peel",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
        BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 0, 41, 62),
                                   dcp::Time (0, 0, 43, 52),
@@ -153,7 +153,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "I enquired if his accent was real",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
@@ -163,7 +163,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
        BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 0, 50, 42),
                                   dcp::Time (0, 0, 52, 21),
@@ -171,14 +171,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "He said \"out of the house",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
        BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 0, 50, 42),
                                   dcp::Time (0, 0, 52, 21),
@@ -186,7 +186,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "I'm incredibly scouse",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
@@ -196,7 +196,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
        BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 1, 2, 208),
                                   dcp::Time (0, 1, 4, 10),
@@ -204,14 +204,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "At home it depends how I feel.\"",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
        BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 1, 2, 208),
                                   dcp::Time (0, 1, 4, 10),
@@ -219,7 +219,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "I spent a long weekend in Brighton",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
@@ -229,7 +229,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
        BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 1, 15, 42),
                                   dcp::Time (0, 1, 16, 42),
@@ -237,14 +237,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "With the legendary Miss Enid Blyton",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
        BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 1, 15, 42),
                                   dcp::Time (0, 1, 16, 42),
@@ -252,7 +252,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "She said \"you be Noddy",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
@@ -262,7 +262,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
        BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 1, 27, 115),
                                   dcp::Time (0, 1, 28, 208),
@@ -270,14 +270,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "That curious creature the Sphinx",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
        BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 1, 27, 115),
                                   dcp::Time (0, 1, 28, 208),
@@ -285,7 +285,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "Is smarter than anyone thinks",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
@@ -295,7 +295,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
        BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
                                   string ("theFont"),
                                   false,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 1, 42, 229),
                                   dcp::Time (0, 1, 45, 62),
@@ -303,14 +303,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "It sits there and smirks",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
        BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
                                   string ("theFont"),
                                   false,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 1, 42, 229),
                                   dcp::Time (0, 1, 45, 62),
@@ -318,7 +318,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "And you don't think it works",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
@@ -328,7 +328,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
        BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
                                   string ("theFont"),
                                   false,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 1, 45, 146),
                                   dcp::Time (0, 1, 47, 94),
@@ -336,14 +336,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "Then when you're not looking, it winks.",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
        BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
                                   string ("theFont"),
                                   false,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 1, 45, 146),
                                   dcp::Time (0, 1, 47, 94),
@@ -351,7 +351,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "When it snows you will find Sister Sledge",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
@@ -361,7 +361,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
        BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
                                   string ("theFont"),
                                   false,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 1, 47, 146),
                                   dcp::Time (0, 1, 48, 167),
@@ -369,14 +369,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "Out mooning, at night, on the ledge",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
        BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
                                   string ("theFont"),
                                   false,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 1, 47, 146),
                                   dcp::Time (0, 1, 48, 167),
@@ -384,7 +384,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "One storey down",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
@@ -394,7 +394,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
        BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 2, 5, 208),
                                   dcp::Time (0, 2, 7, 31),
@@ -402,14 +402,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "HELLO",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));
        BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
-                                  dcp::Color (255, 255, 255),
+                                  dcp::Colour (255, 255, 255),
                                   42,
                                   dcp::Time (0, 2, 5, 208),
                                   dcp::Time (0, 2, 7, 31),
@@ -417,7 +417,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
                                   dcp::TOP,
                                   "WORLD",
                                   dcp::BORDER,
-                                  dcp::Color (0, 0, 0),
+                                  dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0),
                                   dcp::Time (0, 0, 0, 0)
                                   ));

diff --git a/test/wscript b/test/wscript
index 7e7122b178481d18fade0725bca64eb244409725..1ac7cb3e6cc00ab6387987281cee13ddc2a976f3 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -22,7 +22,7 @@ def build(bld):
     obj.use    = 'libdcp%s' % bld.env.API_VERSION
     obj.source = """
                  certificates_test.cc
-                 color_test.cc
+                 colour_test.cc
                  cpl_sar_test.cc
                  dcp_test.cc
                  dcp_time_test.cc

diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index 0bf0df08e890947576edeab5a4b70f3acb47239f..1ebc4d953da17409dd1ba87675d19ffcb3822a9a 100644 (file)
--- 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";