Split metadata into XML and MXF bits; remove singleton.

1 files changed, 14 insertions, 16 deletions

diff --git a/src/metadata.cc b/src/metadata.cc
index 7e900e50..2967ac1d 100644
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -27,16 +27,25 @@
 using namespace std;
 using namespace libdcp;
 
-Metadata* Metadata::_instance = 0;
-
-/** Construct a Metadata object with some default values */
-Metadata::Metadata ()
+MXFMetadata::MXFMetadata ()
 	: company_name ("libdcp")
 	, product_name ("libdcp")
 	, product_version (LIBDCP_VERSION)
-	, issuer ("libdcp" LIBDCP_VERSION)
+{
+
+}
+
+
+XMLMetadata::XMLMetadata ()
+	: issuer ("libdcp" LIBDCP_VERSION)
 	, creator ("libdcp" LIBDCP_VERSION)
 {
+	set_issue_date_now ();
+}
+
+void
+XMLMetadata::set_issue_date_now ()
+{
 	char buffer[64];
 	time_t now;
 	time (&now);
@@ -44,15 +53,4 @@ Metadata::Metadata ()
 	strftime (buffer, 64, "%Y-%m-%dT%I:%M:%S+00:00", tm);
 	issue_date = string (buffer);
 }
-
-/** @return Singleton Metadata instance */
-Metadata *
-Metadata::instance ()
-{
-	if (_instance == 0) {
-		_instance = new Metadata;
-	}
-
-	return _instance;
-}