Remove user-configurable colour conversion presets.

[dcpomatic.git] / src / lib / config.cc

diff --git a/src/lib/config.cc b/src/lib/config.cc
index cc0edd4a5418a0d3d9be9b0f016e78cf573de009..bbb7e1e0b4a18d5f6790a65f1014a29c80979a76 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -27,8 +27,8 @@
 #include "cinema.h"
 #include "util.h"
 #include "cross.h"
+#include "raw_convert.h"
 #include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
 #include <dcp/signer.h>
 #include <dcp/certificate_chain.h>
 #include <libcxml/cxml.h>
@@ -52,7 +52,6 @@ using std::cerr;
 using boost::shared_ptr;
 using boost::optional;
 using boost::algorithm::trim;
-using dcp::raw_convert;
 
 Config* Config::_instance = 0;
 
@@ -84,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);
@@ -91,9 +91,6 @@ Config::set_defaults ()
        _allowed_dcp_frame_rates.push_back (50);
        _allowed_dcp_frame_rates.push_back (60);
 
-       _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ()));
-       _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ()));
-
        set_kdm_email_to_default ();
 }
 
@@ -184,25 +181,6 @@ Config::read ()
        _default_j2k_bandwidth = f.optional_number_child<int>("DefaultJ2KBandwidth").get_value_or (200000000);
        _default_audio_delay = f.optional_number_child<int>("DefaultAudioDelay").get_value_or (0);
 
-       list<cxml::NodePtr> cc = f.node_children ("ColourConversion");
-
-       if (!cc.empty ()) {
-               _colour_conversions.clear ();
-       }
-
-       try {
-               for (list<cxml::NodePtr>::iterator i = cc.begin(); i != cc.end(); ++i) {
-                       /* This is a bit of a hack; use 32 (the first Film state file version for the 2.x branch)
-                          for version 2 and 10 (the current Film state version for the 1.x branch) for version 1.
-                       */
-                       _colour_conversions.push_back (PresetColourConversion (*i, version == 2 ? 32 : 10));
-               }
-       } 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");
        for (list<cxml::NodePtr>::iterator i = cin.begin(); i != cin.end(); ++i) {
                /* Slightly grotty two-part construction of Cinema here so that we can use
@@ -352,10 +330,6 @@ Config::write () const
        root->add_child("DefaultJ2KBandwidth")->add_child_text (raw_convert<string> (_default_j2k_bandwidth));
        root->add_child("DefaultAudioDelay")->add_child_text (raw_convert<string> (_default_audio_delay));
 
-       for (vector<PresetColourConversion>::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) {
-               i->as_xml (root->add_child ("ColourConversion"));
-       }
-
        for (list<shared_ptr<Cinema> >::const_iterator i = _cinemas.begin(); i != _cinemas.end(); ++i) {
                (*i)->as_xml (root->add_child ("Cinema"));
        }
@@ -428,7 +402,6 @@ Config::drop ()
 void
 Config::changed ()
 {
-       write ();
        Changed ();
 }