summaryrefslogtreecommitdiff
path: root/src/lib/config.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-04-24 12:05:21 +0100
committerCarl Hetherington <cth@carlh.net>2015-04-24 12:05:21 +0100
commit1cdedd1c19bd34f1c41043f9bbeae39cb54a0ed8 (patch)
tree460ee0ad60988d641cf00e458fef6c91e3621370 /src/lib/config.cc
parent666808c7f735d5ff0daff70dfb7b0c409113874e (diff)
parent2d3092216e97c02bf715a3df19725518312a0b65 (diff)
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Diffstat (limited to 'src/lib/config.cc')
-rw-r--r--src/lib/config.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc
index c75eaa0f5..ab57c1afc 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -83,6 +83,7 @@ Config::set_defaults ()
_win32_console = false;
#endif
+ _allowed_dcp_frame_rates.clear ();
_allowed_dcp_frame_rates.push_back (24);
_allowed_dcp_frame_rates.push_back (25);
_allowed_dcp_frame_rates.push_back (30);
@@ -90,8 +91,11 @@ Config::set_defaults ()
_allowed_dcp_frame_rates.push_back (50);
_allowed_dcp_frame_rates.push_back (60);
+ _colour_conversions.clear ();
_colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ()));
+ _colour_conversions.push_back (PresetColourConversion (_("Rec. 601"), dcp::ColourConversion::rec601_to_xyz ()));
_colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ()));
+ _colour_conversions.push_back (PresetColourConversion (_("P3 (from SMPTE RP 431-2)"), dcp::ColourConversion::p3_to_xyz ()));
set_kdm_email_to_default ();
}