Bump version

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index e0fbcc703f58042948cb3a1dc83aa62d58f09fe3..9f981c61918b111874858a1af5847a8b8c8c174b 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -22,6 +22,7 @@
 #include <fstream>
 #include <glib.h>
 #include <boost/filesystem.hpp>
+#include <libdcp/colour_matrix.h>
 #include <libcxml/cxml.h>
 #include "config.h"
 #include "server.h"
@@ -30,6 +31,7 @@
 #include "ratio.h"
 #include "dcp_content_type.h"
 #include "sound_processor.h"
+#include "colour_conversion.h"
 
 #include "i18n.h"
 
@@ -53,7 +55,8 @@ Config::Config ()
        , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
        , _default_still_length (10)
        , _default_container (Ratio::from_id ("185"))
-       , _default_dcp_content_type (0)
+       , _default_dcp_content_type (DCPContentType::from_dci_name ("TST"))
+       , _default_j2k_bandwidth (200000000)
 {
        _allowed_dcp_frame_rates.push_back (24);
        _allowed_dcp_frame_rates.push_back (25);
@@ -61,6 +64,9 @@ Config::Config ()
        _allowed_dcp_frame_rates.push_back (48);
        _allowed_dcp_frame_rates.push_back (50);
        _allowed_dcp_frame_rates.push_back (60);
+
+       _colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6));
+       _colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, libdcp::colour_matrix::srgb_to_xyz, 2.6));
 }
 
 void
@@ -71,7 +77,8 @@ Config::read ()
                return;
        }
 
-       cxml::File f (file (false), "Config");
+       cxml::Document f ("Config");
+       f.read_file (file (false));
        optional<string> c;
 
        _num_local_encoding_threads = f.number_child<int> ("NumLocalEncodingThreads");
@@ -80,7 +87,7 @@ Config::read ()
        
        list<shared_ptr<cxml::Node> > servers = f.node_children ("Server");
        for (list<shared_ptr<cxml::Node> >::iterator i = servers.begin(); i != servers.end(); ++i) {
-               _servers.push_back (new ServerDescription (*i));
+               _servers.push_back (ServerDescription (*i));
        }
 
        _tms_ip = f.string_child ("TMSIP");
@@ -110,6 +117,17 @@ Config::read ()
 
        _default_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
        _default_still_length = f.optional_number_child<int>("DefaultStillLength").get_value_or (10);
+       _default_j2k_bandwidth = f.optional_number_child<int>("DefaultJ2KBandwidth").get_value_or (200000000);
+
+       list<shared_ptr<cxml::Node> > cc = f.node_children ("ColourConversion");
+
+       if (!cc.empty ()) {
+               _colour_conversions.clear ();
+       }
+       
+       for (list<shared_ptr<cxml::Node> >::iterator i = cc.begin(); i != cc.end(); ++i) {
+               _colour_conversions.push_back (PresetColourConversion (*i));
+       }
 }
 
 void
@@ -141,7 +159,10 @@ Config::read_old_metadata ()
                } else if (k == N_("server_port")) {
                        _server_port = atoi (v.c_str ());
                } else if (k == N_("server")) {
-                       _servers.push_back (ServerDescription::create_from_metadata (v));
+                       optional<ServerDescription> server = ServerDescription::create_from_metadata (v);
+                       if (server) {
+                               _servers.push_back (server.get ());
+                       }
                } else if (k == N_("tms_ip")) {
                        _tms_ip = v;
                } else if (k == N_("tms_path")) {
@@ -181,7 +202,7 @@ Config::file (bool old) const
        if (old) {
                p /= ".dvdomatic";
        } else {
-               p /= ".dcpomatic.xml";
+               p /= "dcpomatic.xml";
        }
        return p.string ();
 }
@@ -215,8 +236,8 @@ Config::write () const
        root->add_child("DefaultDirectory")->add_child_text (_default_directory);
        root->add_child("ServerPort")->add_child_text (lexical_cast<string> (_server_port));
        
-       for (vector<ServerDescription*>::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
-               (*i)->as_xml (root->add_child ("Server"));
+       for (vector<ServerDescription>::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
+               i->as_xml (root->add_child ("Server"));
        }
 
        root->add_child("TMSIP")->add_child_text (_tms_ip);
@@ -241,6 +262,11 @@ Config::write () const
        _default_dci_metadata.as_xml (root->add_child ("DCIMetadata"));
 
        root->add_child("DefaultStillLength")->add_child_text (lexical_cast<string> (_default_still_length));
+       root->add_child("DefaultJ2KBandwidth")->add_child_text (lexical_cast<string> (_default_j2k_bandwidth));
+
+       for (vector<PresetColourConversion>::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) {
+               i->as_xml (root->add_child ("ColourConversion"));
+       }
 
        doc.write_to_file_formatted (file (false));
 }