Stop CPL <Creator> tag being configurable and use DCP-o-matic version number instead.

3 files changed, 17 insertions, 17 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 04f28579b..67abc63c2 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -150,9 +150,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 {
@@ -266,11 +269,7 @@ Config::read_old_metadata ()
 		} else if (k == "default_dcp_content_type") {
 			_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") {
-			_dcp_metadata.creator = v;
-		} else if (k == "dcp_metadata_issue_date") {
-			_dcp_metadata.issue_date = v;
+			_dcp_issuer = v;
 		}
 
 		_default_isdcf_metadata.read_old_metadata (k, v);
@@ -363,8 +362,7 @@ Config::write () const
 	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"));
 
diff --git a/src/lib/config.h b/src/lib/config.h
index aa3c06356..4f6b57f56 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -28,7 +28,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/metadata.h>
 #include "isdcf_metadata.h"
 #include "colour_conversion.h"
 #include "server.h"
@@ -145,8 +144,8 @@ public:
 		return _default_dcp_content_type;
 	}
 
-	libdcp::XMLMetadata dcp_metadata () const {
-		return _dcp_metadata;
+	std::string dcp_issuer () const {
+		return _dcp_issuer;
 	}
 
 	int default_j2k_bandwidth () const {
@@ -309,8 +308,8 @@ public:
 		changed ();
 	}
 
-	void set_dcp_metadata (libdcp::XMLMetadata m) {
-		_dcp_metadata = m;
+	void set_dcp_issuer (std::string i) {
+		_dcp_issuer = i;
 		changed ();
 	}
 
@@ -445,7 +444,7 @@ private:
 	Ratio const * _default_scale;
 	Ratio const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
-	libdcp::XMLMetadata _dcp_metadata;
+	std::string _dcp_issuer;
 	int _default_j2k_bandwidth;
 	int _default_audio_delay;
 	std::vector<PresetColourConversion> _colour_conversions;
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index e8d4f90a6..dd2e98eee 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -38,6 +38,7 @@
 #include "job.h"
 #include "cross.h"
 #include "md5_digester.h"
+#include "version.h"
 
 #include "i18n.h"
 
@@ -471,7 +472,9 @@ Writer::finish ()
 		_sound_asset->compute_digest (boost::bind (&Job::set_progress, job.get(), _1, false));
 	}
 
-	libdcp::XMLMetadata meta = Config::instance()->dcp_metadata ();
+	libdcp::XMLMetadata meta;
+	meta.issuer = Config::instance()->dcp_issuer ();
+	meta.creator = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit);
 	meta.set_issue_date_now ();
 	dcp.write_xml (_film->interop (), meta, _film->is_signed() ? make_signer () : shared_ptr<const libdcp::Signer> ());