Adapt for changes to libdcp.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 5f48262fbfb783a4e87c285ff9239685b0efc22b..d43024128915d19046c1e6150cc87bcb31f20250 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -17,16 +17,6 @@
 
 */
 
-#include <cstdlib>
-#include <fstream>
-#include <glib.h>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
-#include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
-#include <dcp/signer.h>
-#include <dcp/certificate_chain.h>
-#include <libcxml/cxml.h>
 #include "config.h"
 #include "server.h"
 #include "scaler.h"
@@ -38,6 +28,16 @@
 #include "cinema.h"
 #include "util.h"
 #include "cross.h"
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
+#include <dcp/signer.h>
+#include <dcp/certificate_chain.h>
+#include <libcxml/cxml.h>
+#include <glib.h>
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
+#include <cstdlib>
+#include <fstream>
 
 #include "i18n.h"
 
@@ -52,8 +52,7 @@ using std::exception;
 using std::cerr;
 using boost::shared_ptr;
 using boost::optional;
-using boost::algorithm::is_any_of;
-using boost::algorithm::split;
+using boost::algorithm::trim;
 using dcp::raw_convert;
 
 Config* Config::_instance = 0;
@@ -86,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 ();
 }
@@ -178,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");
@@ -379,8 +376,14 @@ Config::write () const
        for (vector<boost::filesystem::path>::const_iterator i = _history.begin(); i != _history.end(); ++i) {
                root->add_child("History")->add_child_text (i->string ());
        }
-       
-       doc.write_to_file_formatted (file().string ());
+
+       try {
+               doc.write_to_file_formatted (file().string ());
+       } catch (xmlpp::exception& e) {
+               string s = e.what ();
+               trim (s);
+               throw FileError (s, file ());
+       }
 }
 
 boost::filesystem::path