X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=2b7b81cfeec2a3b067ab482c264eeea49a30ec6b;hb=c6c082c4a8016f85ba4207f4b8ccee1d5770e4a4;hp=7e37625878191a87db0e7bf1cf3959e5b3fb68e3;hpb=22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 7e3762587..2b7b81cfe 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -67,7 +67,7 @@ Config::Config ()
 	, _cinema_sound_processor (CinemaSoundProcessor::from_id (N_("dolby_cp750")))
 	, _allow_any_dcp_frame_rate (false)
 	, _default_still_length (10)
-	, _default_scale (Ratio::from_id ("185"))
+	, _default_scale (VideoContentScale (Ratio::from_id ("185")))
 	, _default_container (Ratio::from_id ("185"))
 	, _default_dcp_content_type (DCPContentType::from_isdcf_name ("TST"))
 	, _default_j2k_bandwidth (100000000)
@@ -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);
@@ -94,7 +97,7 @@ Config::Config ()
 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 */
@@ -103,7 +106,7 @@ Config::read ()
 	}
 
 	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");
@@ -147,7 +150,7 @@ Config::read ()
 
 	c = f.optional_string_child ("DefaultScale");
 	if (c) {
-		_default_scale = Ratio::from_id (c.get ());
+		_default_scale = VideoContentScale::from_id (c.get ());
 	}
 
 	c = f.optional_string_child ("DefaultContainer");
@@ -160,9 +163,12 @@ Config::read ()
 		_default_dcp_content_type = DCPContentType::from_isdcf_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 ("");
-
+	if (f.optional_string_child ("DCPMetadataIssuer")) {
+		_dcp_issuer = f.string_child ("DCPMetadataIssuer");
+	} else if (f.optional_string_child ("DCPIssuer")) {
+		_dcp_issuer = f.string_child ("DCPIssuer");
+	}
+	
 	if (version && version.get() >= 2) {
 		_default_isdcf_metadata = ISDCFMetadata (f.node_child ("ISDCFMetadata"));
 	} else {
@@ -216,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) {
@@ -262,19 +271,15 @@ Config::make_decryption_keys ()
 
 /** @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;
 }
 
@@ -326,17 +331,14 @@ Config::write () const
 	if (_language) {
 		root->add_child("Language")->add_child_text (_language.get());
 	}
-	if (_default_scale) {
-		root->add_child("DefaultScale")->add_child_text (_default_scale->id ());
-	}
+	root->add_child("DefaultScale")->add_child_text (_default_scale.id ());
 	if (_default_container) {
 		root->add_child("DefaultContainer")->add_child_text (_default_container->id ());
 	}
 	if (_default_dcp_content_type) {
 		root->add_child("DefaultDCPContentType")->add_child_text (_default_dcp_content_type->isdcf_name ());
 	}
-	root->add_child("DCPMetadataIssuer")->add_child_text (_dcp_metadata.issuer);
-	root->add_child("DCPMetadataCreator")->add_child_text (_dcp_metadata.creator);
+	root->add_child("DCPIssuer")->add_child_text (_dcp_issuer);
 
 	_default_isdcf_metadata.as_xml (root->add_child ("ISDCFMetadata"));
 
@@ -367,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 ();
@@ -382,7 +387,7 @@ Config::write () const
 		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