Merge master.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 2defa053921ccc079cc9e0bd14c79a2f3ebe3a99..b6f464717b48c7f6ca3f5a590c58ca5480d01e22 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -27,6 +27,8 @@
 #include "server.h"
 #include "scaler.h"
 #include "filter.h"
+#include "format.h"
+#include "dcp_content_type.h"
 #include "sound_processor.h"
 
 #include "i18n.h"
@@ -37,6 +39,7 @@ using std::string;
 using std::ofstream;
 using std::list;
 using boost::shared_ptr;
+using boost::lexical_cast;
 using boost::optional;
 
 Config* Config::_instance = 0;
@@ -48,6 +51,9 @@ Config::Config ()
        , _reference_scaler (Scaler::from_id (N_("bicubic")))
        , _tms_path (N_("."))
        , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
+       , _default_still_length (10)
+       , _default_format (0)
+       , _default_dcp_content_type (0)
 {
        _allowed_dcp_frame_rates.push_back (24);
        _allowed_dcp_frame_rates.push_back (25);
@@ -93,7 +99,22 @@ Config::Config ()
        }
 
        _language = f.optional_string_child ("Language");
+
+       c = f.optional_string_child ("DefaultFormat");
+       if (c) {
+               _default_format = Format::from_id (c.get ());
+       }
+
+       c = f.optional_string_child ("DefaultDCPContentType");
+       if (c) {
+               _default_dcp_content_type = DCPContentType::from_dci_name (c.get ());
+       }
+
+       _dcp_metadata.issuer = f.optional_string_child ("DCPMetadataIssuer").get_value_or ("");
+       _dcp_metadata.creator = f.optional_string_child ("DCPMetadataCreator").get_value_or ("");
+
        _default_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
+       _default_still_length = f.optional_number_child<int>("DefaultStillLength").get_value_or (10);
 }
 
 void
@@ -142,6 +163,16 @@ Config::read_old_metadata ()
                        _sound_processor = SoundProcessor::from_id (v);
                } else if (k == "language") {
                        _language = v;
+               } else if (k == "default_format") {
+                       _default_format = Format::from_id (v);
+               } else if (k == "default_dcp_content_type") {
+                       _default_dcp_content_type = DCPContentType::from_dci_name (v);
+               } else if (k == "dcp_metadata_issuer") {
+                       _dcp_metadata.issuer = v;
+               } else if (k == "dcp_metadata_creator") {
+                       _dcp_metadata.creator = v;
+               } else if (k == "dcp_metadata_issue_date") {
+                       _dcp_metadata.issue_date = v;
                }
 
                _default_dci_metadata.read_old_metadata (k, v);
@@ -157,7 +188,7 @@ Config::file (bool old) const
        if (old) {
                p /= ".dvdomatic";
        } else {
-               p /= ".dvdomatic.xml";
+               p /= ".dcpomatic.xml";
        }
        return p.string ();
 }
@@ -180,9 +211,9 @@ Config::write () const
        xmlpp::Document doc;
        xmlpp::Element* root = doc.create_root_node ("Config");
 
-       root->add_child("NumLocalEncodingThreads")->add_child_text (boost::lexical_cast<string> (_num_local_encoding_threads));
+       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 (boost::lexical_cast<string> (_server_port));
+       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 ());
        }
@@ -205,9 +236,19 @@ Config::write () const
        if (_language) {
                root->add_child("Language")->add_child_text (_language.get());
        }
+       if (_default_format) {
+               root->add_child("DefaultFormat")->add_child_text (_default_format->id ());
+       }
+       if (_default_dcp_content_type) {
+               root->add_child("DefaultDCPContentType")->add_child_text (_default_dcp_content_type->dci_name ());
+       }
+       root->add_child("DCPMetadataIssuer")->add_child_text (_dcp_metadata.issuer);
+       root->add_child("DCPMetadataCreator")->add_child_text (_dcp_metadata.creator);
 
        _default_dci_metadata.as_xml (root->add_child ("DCIMetadata"));
 
+       root->add_child("DefaultStillLength")->add_child_text (lexical_cast<string> (_default_still_length));
+
        doc.write_to_file_formatted (file (false));
 }