Merge remote-tracking branch 'origin/master' into 2.0

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index d624e607045349c9dc21af0d0b29b65f0f2cbd5b..2b7b81cfeec2a3b067ab482c264eeea49a30ec6b 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -76,6 +76,9 @@ Config::Config ()
        , _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);
@@ -219,6 +222,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) {
@@ -363,6 +369,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 ();