Adapt for changes to libdcp.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index d624e607045349c9dc21af0d0b29b65f0f2cbd5b..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;
@@ -67,15 +66,17 @@ Config::Config ()
        , _cinema_sound_processor (CinemaSoundProcessor::from_id (N_("dolby_cp750")))
        , _allow_any_dcp_frame_rate (false)
        , _default_still_length (10)
-       , _default_scale (VideoContentScale (Ratio::from_id ("185")))
        , _default_container (Ratio::from_id ("185"))
-       , _default_dcp_content_type (DCPContentType::from_isdcf_name ("TST"))
+       , _default_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"))
        , _default_j2k_bandwidth (100000000)
        , _default_audio_delay (0)
        , _check_for_updates (false)
        , _check_for_test_updates (false)
        , _maximum_j2k_bandwidth (250000000)
        , _log_types (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR)
+#ifdef DCPOMATIC_WINDOWS         
+       , _win32_console (false)
+#endif   
 {
        _allowed_dcp_frame_rates.push_back (24);
        _allowed_dcp_frame_rates.push_back (25);
@@ -84,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 ();
 }
@@ -145,11 +145,6 @@ Config::read ()
 
        _language = f.optional_string_child ("Language");
 
-       c = f.optional_string_child ("DefaultScale");
-       if (c) {
-               _default_scale = VideoContentScale::from_id (c.get ());
-       }
-
        c = f.optional_string_child ("DefaultContainer");
        if (c) {
                _default_container = Ratio::from_id (c.get ());
@@ -181,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");
@@ -219,6 +213,9 @@ Config::read ()
        _allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate");
 
        _log_types = f.optional_number_child<int> ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR);
+#ifdef DCPOMATIC_WINDOWS       
+       _win32_console = f.optional_bool_child ("Win32Console").get_value_or (false);
+#endif 
 
        list<cxml::NodePtr> his = f.node_children ("History");
        for (list<cxml::NodePtr>::const_iterator i = his.begin(); i != his.end(); ++i) {
@@ -325,7 +322,6 @@ Config::write () const
        if (_language) {
                root->add_child("Language")->add_child_text (_language.get());
        }
-       root->add_child("DefaultScale")->add_child_text (_default_scale.id ());
        if (_default_container) {
                root->add_child("DefaultContainer")->add_child_text (_default_container->id ());
        }
@@ -363,6 +359,9 @@ Config::write () const
        root->add_child("MaximumJ2KBandwidth")->add_child_text (raw_convert<string> (_maximum_j2k_bandwidth));
        root->add_child("AllowAnyDCPFrameRate")->add_child_text (_allow_any_dcp_frame_rate ? "1" : "0");
        root->add_child("LogTypes")->add_child_text (raw_convert<string> (_log_types));
+#ifdef DCPOMATIC_WINDOWS       
+       root->add_child("Win32Console")->add_child_text (_win32_console ? "1" : "0");
+#endif 
 
        xmlpp::Element* signer = root->add_child ("Signer");
        dcp::CertificateChain::List certs = _signer->certificates().root_to_leaf ();
@@ -377,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