summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-01-03 22:04:03 +0000
committerCarl Hetherington <cth@carlh.net>2015-01-03 22:04:03 +0000
commit85dc34ad9985b412550be12f1867a73e6108fe44 (patch)
tree96a944224aa74ba05e72e755fdf47d457c161fcd /src
parent05b73764ee2a4637f7bc37dc4d7488b52d437ae6 (diff)
Cope with libdcp1 API change.
Diffstat (limited to 'src')
-rw-r--r--src/dcp_reader.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dcp_reader.cc b/src/dcp_reader.cc
index 863cb68..5ae0032 100644
--- a/src/dcp_reader.cc
+++ b/src/dcp_reader.cc
@@ -37,7 +37,7 @@ dcp_to_metric (dcp::Time t)
}
static Colour
-dcp_to_colour (dcp::Color c)
+dcp_to_colour (dcp::Colour c)
{
return Colour (float (c.r) / 255, float (c.g) / 255, float (c.b) / 255);
}
@@ -91,8 +91,8 @@ DCPReader::DCPReader (boost::filesystem::path file, bool interop)
break;
}
- sub.effect_colour = dcp_to_colour (i->effect_color ());
- sub.colour = dcp_to_colour (i->color ());
+ sub.effect_colour = dcp_to_colour (i->effect_colour ());
+ sub.colour = dcp_to_colour (i->colour ());
sub.italic = i->italic ();
_subs.push_back (sub);