diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-28 01:00:25 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-28 01:00:25 +0000 |
| commit | 6154d5f85664a26e9490c9120bef5e742af94490 (patch) | |
| tree | b6d8af6fb5a5d11357b60d84c74ed92ee7859c66 /src/lib/config.cc | |
| parent | 86c09d276bc4d2a85321f8c1ba4f06c1cdf25b7c (diff) | |
Basic adaptations for changes to libdcp1 colour conversion handling.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index c571376f0..485ecbad7 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -85,9 +85,8 @@ Config::Config () _allowed_dcp_frame_rates.push_back (50); _allowed_dcp_frame_rates.push_back (60); - _colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6)); - _colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, dcp::colour_matrix::srgb_to_xyz, 2.6)); - _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6)); + _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz)); + _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz)); reset_kdm_email (); } @@ -177,16 +176,15 @@ Config::read () if (!cc.empty ()) { _colour_conversions.clear (); } - - for (list<cxml::NodePtr>::iterator i = cc.begin(); i != cc.end(); ++i) { - _colour_conversions.push_back (PresetColourConversion (*i)); - } - if (!version) { - /* Loading version 0 (before Rec. 709 was added as a preset). - Add it in. - */ - _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6)); + try { + for (list<cxml::NodePtr>::iterator i = cc.begin(); i != cc.end(); ++i) { + _colour_conversions.push_back (PresetColourConversion (*i)); + } + } catch (cxml::Error) { + /* Probably failed to load an old-style ColourConversion tag; just give up */ + _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz)); + _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz)); } list<cxml::NodePtr> cin = f.node_children ("Cinema"); |