Merge 1.0 in.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 978428b02dcc61aba49667f3f2cb8e5cde38e45e..5b96d108ccdfdd51a9d08595eb1e6c0c9b9d710b 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"
 
@@ -38,6 +40,7 @@ using std::ifstream;
 using std::string;
 using std::ofstream;
 using std::list;
+using std::max;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using boost::optional;
@@ -46,14 +49,14 @@ Config* Config::_instance = 0;
 
 /** Construct default configuration */
 Config::Config ()
-       : _num_local_encoding_threads (2)
+       : _num_local_encoding_threads (max (2U, boost::thread::hardware_concurrency()))
        , _server_port (6192)
-       , _reference_scaler (Scaler::from_id (N_("bicubic")))
        , _tms_path (N_("."))
        , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
        , _default_still_length (10)
-       , _default_container (0)
-       , _default_dcp_content_type (0)
+       , _default_container (Ratio::from_id ("185"))
+       , _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,25 +77,17 @@ 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");
        _default_directory = f.string_child ("DefaultDirectory");
        _server_port = f.number_child<int> ("ServerPort");
-       c = f.optional_string_child ("ReferenceScaler");
-       if (c) {
-               _reference_scaler = Scaler::from_id (c.get ());
-       }
-
-       list<shared_ptr<cxml::Node> > filters = f.node_children ("ReferenceFilter");
-       for (list<shared_ptr<cxml::Node> >::iterator i = filters.begin(); i != filters.end(); ++i) {
-               _reference_filters.push_back (Filter::from_id ((*i)->content ()));
-       }
        
        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");
@@ -119,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
@@ -126,6 +135,7 @@ Config::read_old_metadata ()
 {
        ifstream f (file(true).c_str ());
        string line;
+
        while (getline (f, line)) {
                if (line.empty ()) {
                        continue;
@@ -149,12 +159,11 @@ Config::read_old_metadata ()
                        _default_directory = v;
                } else if (k == N_("server_port")) {
                        _server_port = atoi (v.c_str ());
-               } else if (k == N_("reference_scaler")) {
-                       _reference_scaler = Scaler::from_id (v);
-               } else if (k == N_("reference_filter")) {
-                       _reference_filters.push_back (Filter::from_id (v));
                } 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")) {
@@ -189,14 +198,27 @@ Config::file (bool old) const
 {
        boost::filesystem::path p;
        p /= g_get_user_config_dir ();
+       boost::system::error_code ec;
+       boost::filesystem::create_directory (p, ec);
        if (old) {
                p /= ".dvdomatic";
        } else {
-               p /= ".dcpomatic.xml";
+               p /= "dcpomatic.xml";
        }
        return p.string ();
 }
 
+string
+Config::crypt_chain_directory () const
+{
+       boost::filesystem::path p;
+       p /= g_get_user_config_dir ();
+       p /= "dvdomatic";
+       p /= "crypt";
+       boost::filesystem::create_directories (p);
+       return p.string ();
+}
+
 /** @return Singleton instance */
 Config *
 Config::instance ()
@@ -225,16 +247,9 @@ Config::write () const
        root->add_child("NumLocalEncodingThreads")->add_child_text (lexical_cast<string> (_num_local_encoding_threads));
        root->add_child("DefaultDirectory")->add_child_text (_default_directory);
        root->add_child("ServerPort")->add_child_text (lexical_cast<string> (_server_port));
-       if (_reference_scaler) {
-               root->add_child("ReferenceScaler")->add_child_text (_reference_scaler->id ());
-       }
-
-       for (vector<Filter const *>::const_iterator i = _reference_filters.begin(); i != _reference_filters.end(); ++i) {
-               root->add_child("ReferenceFilter")->add_child_text ((*i)->id ());
-       }
        
-       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);
@@ -259,6 +274,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));
 }