Fix merge.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 5b96d108ccdfdd51a9d08595eb1e6c0c9b9d710b..79a7b01f1dd68f4aebf39cb07e5797533926abfa 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -32,6 +32,7 @@
 #include "dcp_content_type.h"
 #include "sound_processor.h"
 #include "colour_conversion.h"
+#include "cinema.h"
 
 #include "i18n.h"
 
@@ -51,12 +52,15 @@ Config* Config::_instance = 0;
 Config::Config ()
        : _num_local_encoding_threads (max (2U, boost::thread::hardware_concurrency()))
        , _server_port (6192)
-       , _tms_path (N_("."))
+       , _tms_path (".")
        , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
        , _default_still_length (10)
        , _default_container (Ratio::from_id ("185"))
        , _default_dcp_content_type (DCPContentType::from_dci_name ("TST"))
        , _default_j2k_bandwidth (200000000)
+       , _kdm_email (
+               "Dear Projectionist\n\nPlease find attached KDMs for $CPL_NAME.\n\nBest regards,\nDCP-o-matic"
+               )
 {
        _allowed_dcp_frame_rates.push_back (24);
        _allowed_dcp_frame_rates.push_back (25);
@@ -128,12 +132,26 @@ Config::read ()
        for (list<shared_ptr<cxml::Node> >::iterator i = cc.begin(); i != cc.end(); ++i) {
                _colour_conversions.push_back (PresetColourConversion (*i));
        }
+
+       list<shared_ptr<cxml::Node> > cin = f.node_children ("Cinema");
+       for (list<shared_ptr<cxml::Node> >::iterator i = cin.begin(); i != cin.end(); ++i) {
+               /* Slightly grotty two-part construction of Cinema here so that we can use
+                  shared_from_this.
+               */
+               shared_ptr<Cinema> cinema (new Cinema (*i));
+               cinema->read_screens (*i);
+               _cinemas.push_back (cinema);
+       }
+
+       _mail_server = f.string_child ("MailServer");
+       _kdm_from = f.string_child ("KDMFrom");
+       _kdm_email = f.string_child ("KDMEmail");
 }
 
 void
 Config::read_old_metadata ()
 {
-       ifstream f (file(true).c_str ());
+       ifstream f (file(true).string().c_str ());
        string line;
 
        while (getline (f, line)) {
@@ -193,7 +211,7 @@ Config::read_old_metadata ()
 }
 
 /** @return Filename to write configuration to */
-string
+boost::filesystem::path
 Config::file (bool old) const
 {
        boost::filesystem::path p;
@@ -203,20 +221,21 @@ Config::file (bool old) const
        if (old) {
                p /= ".dvdomatic";
        } else {
-               p /= "dcpomatic.xml";
+               p /= "dcpomatic";
+               p /= "config.xml";
        }
-       return p.string ();
+       return p;
 }
 
-string
-Config::crypt_chain_directory () const
+boost::filesystem::path
+Config::signer_chain_directory () const
 {
        boost::filesystem::path p;
        p /= g_get_user_config_dir ();
-       p /= "dvdomatic";
+       p /= "dcpomatic";
        p /= "crypt";
        boost::filesystem::create_directories (p);
-       return p.string ();
+       return p;
 }
 
 /** @return Singleton instance */
@@ -245,7 +264,7 @@ Config::write () const
        xmlpp::Element* root = doc.create_root_node ("Config");
 
        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("DefaultDirectory")->add_child_text (_default_directory.string ());
        root->add_child("ServerPort")->add_child_text (lexical_cast<string> (_server_port));
        
        for (vector<ServerDescription>::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
@@ -280,11 +299,19 @@ Config::write () const
                i->as_xml (root->add_child ("ColourConversion"));
        }
 
-       doc.write_to_file_formatted (file (false));
+       for (list<shared_ptr<Cinema> >::const_iterator i = _cinemas.begin(); i != _cinemas.end(); ++i) {
+               (*i)->as_xml (root->add_child ("Cinema"));
+       }
+
+       root->add_child("MailServer")->add_child_text (_mail_server);
+       root->add_child("KDMFrom")->add_child_text (_kdm_from);
+       root->add_child("KDMEmail")->add_child_text (_kdm_email);
+
+       doc.write_to_file_formatted (file(false).string ());
 }
 
-string
-Config::default_directory_or (string a) const
+boost::filesystem::path
+Config::default_directory_or (boost::filesystem::path a) const
 {
        if (_default_directory.empty() || !boost::filesystem::exists (_default_directory)) {
                return a;