summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-08-16 22:08:34 +0100
committerCarl Hetherington <cth@carlh.net>2013-08-16 22:08:34 +0100
commit4d794a8e6a492c2983b4d5b8376b114b170f41e5 (patch)
tree64c5abb85a3df0f8eed86c63feca601506690fa1 /src/lib
parent884eec78038b7180a9b80550677e59e084413344 (diff)
Remove dot from config .xml name; add non-linearised sRGB to defaults.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/config.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 8f4e5aed0..0c8413be9 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -65,7 +65,13 @@ Config::Config ()
_allowed_dcp_frame_rates.push_back (50);
_allowed_dcp_frame_rates.push_back (60);
- _colour_conversions.push_back (shared_ptr<ColourConversion> (new ColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::xyz_to_rgb, 2.6)));
+ _colour_conversions.push_back (shared_ptr<ColourConversion> (
+ new ColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::xyz_to_rgb, 2.6))
+ );
+
+ _colour_conversions.push_back (shared_ptr<ColourConversion> (
+ new ColourConversion (_("sRGB non-linearised"), 2.4, false, libdcp::colour_matrix::xyz_to_rgb, 2.6))
+ );
}
void
@@ -197,7 +203,7 @@ Config::file (bool old) const
if (old) {
p /= ".dvdomatic";
} else {
- p /= ".dcpomatic.xml";
+ p /= "dcpomatic.xml";
}
return p.string ();
}