Get Signer to take a PEM string rather than a filename.

[libdcp.git] / src / metadata.cc

diff --git a/src/metadata.cc b/src/metadata.cc
index 3da7da12cd4b7a798914324d98cd6fac548bd10f..e2e19f3c014b05955a2014107fdf75c566dbacf2 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,16 +18,18 @@
 */
 
 /** @file  src/metadata.cc
- *  @brief Metadata for writing to the DCP.
+ *  @brief XMLMetadata and MXFMetadata classes.
  */
 
+#include "metadata.h"
+#include "util.h"
+#include "local_time.h"
 #include <sstream>
 #include <iomanip>
 #include <time.h>
-#include "metadata.h"
 
 using namespace std;
-using namespace libdcp;
+using namespace dcp;
 
 MXFMetadata::MXFMetadata ()
        : company_name ("libdcp")
@@ -48,40 +50,5 @@ XMLMetadata::XMLMetadata ()
 void
 XMLMetadata::set_issue_date_now ()
 {
-       char buffer[64];
-       time_t now;
-       time (&now);
-       struct tm* tm = localtime (&now);
-#ifdef LIBDCP_POSIX    
-       strftime (buffer, 64, "%Y-%m-%dT%I:%M:%S%z", tm);
-       issue_date = string (buffer);
-#else
-       /* No %z for strftime on Windows: it will seemingly be interpreted as %Z and will
-          output some localised string describing the timezone */
-       strftime (buffer, 64, "%Y-%m-%dT%I:%M:%S", tm);
-
-       TIME_ZONE_INFORMATION tz;
-       GetTimeZoneInformation (&tz);
-       issue_date = string (buffer) + bias_to_string (tz.Bias);
-#endif
-}
-
-string
-XMLMetadata::bias_to_string (int b)
-{
-       bool const negative = (b < 0);
-       b = negative ? -b : b;
-
-       int const hours = b / 60;
-       int const minutes = b % 60;
-
-       stringstream o;
-       if (negative) {
-               o << "-";
-       } else {
-               o << "+";
-       }
-
-       o << setw(2) << setfill('0') << hours << setw(2) << setfill('0') << minutes;
-       return o.str ();
+       issue_date = LocalTime().as_string ();
 }