Remove dot from config .xml name; add non-linearised sRGB to defaults.
authorCarl Hetherington <cth@carlh.net>
Fri, 16 Aug 2013 21:08:34 +0000 (22:08 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 16 Aug 2013 21:08:34 +0000 (22:08 +0100)
src/lib/config.cc

index 8f4e5aed02763a204593f22cab98ca4ead60ef11..0c8413be9f8509c8fed9027c0e06ca822ec36757 100644 (file)
@@ -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 ();
 }