Fix copy and paste error in previous commit.

[libdcp.git] / src / metadata.cc

diff --git a/src/metadata.cc b/src/metadata.cc
index 2967ac1ddf0183a437b9112b48b7847db7027cf5..8d8abc60f625165d6091c4eca668ccddd4d0f385 100644 (file)
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,14 +18,19 @@
 */
 
 /** @file  src/metadata.cc
- *  @brief Metadata for writing to the DCP.
+ *  @brief XMLMetadata and MXFMetadata classes.
  */
 
-#include <time.h>
 #include "metadata.h"
+#include "util.h"
+#include "local_time.h"
+#include "AS_DCP.h"
+#include <sstream>
+#include <iomanip>
+#include <time.h>
 
 using namespace std;
-using namespace libdcp;
+using namespace dcp;
 
 MXFMetadata::MXFMetadata ()
        : company_name ("libdcp")
@@ -35,6 +40,13 @@ MXFMetadata::MXFMetadata ()
 
 }
 
+void
+MXFMetadata::read (ASDCP::WriterInfo const & info)
+{
+       company_name = info.CompanyName;
+       product_name = info.ProductName;
+       product_version = info.ProductVersion;
+}
 
 XMLMetadata::XMLMetadata ()
        : issuer ("libdcp" LIBDCP_VERSION)
@@ -43,14 +55,9 @@ XMLMetadata::XMLMetadata ()
        set_issue_date_now ();
 }
 
+/** Set the issue date to the current local time */
 void
 XMLMetadata::set_issue_date_now ()
 {
-       char buffer[64];
-       time_t now;
-       time (&now);
-       struct tm* tm = localtime (&now);
-       strftime (buffer, 64, "%Y-%m-%dT%I:%M:%S+00:00", tm);
-       issue_date = string (buffer);
+       issue_date = LocalTime().as_string ();
 }
-