X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=a0211386baf224d248543f13848f9fb3aaac58a4;hb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;hp=b97ad559dc949c8f21da787e51611e6bf4e48a0b;hpb=2935d9d158cf35496a35107f9c4ab7d2929cf6c3;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index b97ad559d..a0211386b 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -23,8 +23,8 @@
 #include <glib.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include <libdcp/colour_matrix.h>
-#include <libdcp/raw_convert.h>
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include "config.h"
 #include "server.h"
@@ -50,7 +50,7 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::algorithm::is_any_of;
 using boost::algorithm::split;
-using libdcp::raw_convert;
+using dcp::raw_convert;
 
 Config* Config::_instance = 0;
 
@@ -64,7 +64,7 @@ Config::Config ()
 	, _allow_any_dcp_frame_rate (false)
 	, _default_still_length (10)
 	, _default_container (Ratio::from_id ("185"))
-	, _default_dcp_content_type (DCPContentType::from_dci_name ("TST"))
+	, _default_dcp_content_type (DCPContentType::from_isdcf_name ("TST"))
 	, _default_j2k_bandwidth (100000000)
 	, _default_audio_delay (0)
 	, _kdm_email (
@@ -82,9 +82,9 @@ Config::Config ()
 	_allowed_dcp_frame_rates.push_back (50);
 	_allowed_dcp_frame_rates.push_back (60);
 
-	_colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6));
-	_colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, libdcp::colour_matrix::srgb_to_xyz, 2.6));
-	_colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, libdcp::colour_matrix::rec709_to_xyz, 2.6));
+	_colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6));
+	_colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, dcp::colour_matrix::srgb_to_xyz, 2.6));
+	_colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6));
 }
 
 void
@@ -141,13 +141,18 @@ Config::read ()
 
 	c = f.optional_string_child ("DefaultDCPContentType");
 	if (c) {
-		_default_dcp_content_type = DCPContentType::from_dci_name (c.get ());
+		_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 ("");
 
-	_default_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
+	if (version && version.get() >= 2) {
+		_default_isdcf_metadata = ISDCFMetadata (f.node_child ("ISDCFMetadata"));
+	} else {
+		_default_isdcf_metadata = ISDCFMetadata (f.node_child ("DCIMetadata"));
+	}
+	
 	_default_still_length = f.optional_number_child<int>("DefaultStillLength").get_value_or (10);
 	_default_j2k_bandwidth = f.optional_number_child<int>("DefaultJ2KBandwidth").get_value_or (200000000);
 	_default_audio_delay = f.optional_number_child<int>("DefaultAudioDelay").get_value_or (0);
@@ -166,7 +171,7 @@ Config::read ()
 		/* Loading version 0 (before Rec. 709 was added as a preset).
 		   Add it in.
 		*/
-		_colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, libdcp::colour_matrix::rec709_to_xyz, 2.6));
+		_colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6));
 	}
 
 	list<cxml::NodePtr> cin = f.node_children ("Cinema");
@@ -245,7 +250,7 @@ Config::read_old_metadata ()
 		} else if (k == "default_container") {
 			_default_container = Ratio::from_id (v);
 		} else if (k == "default_dcp_content_type") {
-			_default_dcp_content_type = DCPContentType::from_dci_name (v);
+			_default_dcp_content_type = DCPContentType::from_isdcf_name (v);
 		} else if (k == "dcp_metadata_issuer") {
 			_dcp_metadata.issuer = v;
 		} else if (k == "dcp_metadata_creator") {
@@ -254,7 +259,7 @@ Config::read_old_metadata ()
 			_dcp_metadata.issue_date = v;
 		}
 
-		_default_dci_metadata.read_old_metadata (k, v);
+		_default_isdcf_metadata.read_old_metadata (k, v);
 	}
 }
 
@@ -315,7 +320,7 @@ Config::write () const
 	xmlpp::Document doc;
 	xmlpp::Element* root = doc.create_root_node ("Config");
 
-	root->add_child("Version")->add_child_text ("1");
+	root->add_child("Version")->add_child_text ("2");
 	root->add_child("NumLocalEncodingThreads")->add_child_text (raw_convert<string> (_num_local_encoding_threads));
 	root->add_child("DefaultDirectory")->add_child_text (_default_directory.string ());
 	root->add_child("ServerPortBase")->add_child_text (raw_convert<string> (_server_port_base));
@@ -339,12 +344,12 @@ Config::write () const
 		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->dci_name ());
+		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);
 
-	_default_dci_metadata.as_xml (root->add_child ("DCIMetadata"));
+	_default_isdcf_metadata.as_xml (root->add_child ("ISDCFMetadata"));
 
 	root->add_child("DefaultStillLength")->add_child_text (raw_convert<string> (_default_still_length));
 	root->add_child("DefaultJ2KBandwidth")->add_child_text (raw_convert<string> (_default_j2k_bandwidth));