, _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);
void
Config::read ()
{
- if (!boost::filesystem::exists (file (false))) {
+ if (!boost::filesystem::exists (file ())) {
/* Make a new set of signing certificates and key */
_signer.reset (new dcp::Signer (openssl_path ()));
/* And decryption keys */
}
cxml::Document f ("Config");
- f.read_file (file (false));
+ f.read_file (file ());
optional<string> c;
optional<int> version = f.optional_number_child<int> ("Version");
_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) {
/** @return Filename to write configuration to */
boost::filesystem::path
-Config::file (bool old) const
+Config::file () 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";
- boost::filesystem::create_directory (p, ec);
- p /= "config.xml";
- }
+ p /= "dcpomatic2";
+ boost::filesystem::create_directory (p, ec);
+ p /= "config.xml";
return p;
}
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 ();
root->add_child("History")->add_child_text (i->string ());
}
- doc.write_to_file_formatted (file(false).string ());
+ doc.write_to_file_formatted (file().string ());
}
boost::filesystem::path