Allow setting of a CPL's MXF keys.

[libdcp.git] / src / metadata.cc

diff --git a/src/metadata.cc b/src/metadata.cc
index 3da7da12cd4b7a798914324d98cd6fac548bd10f..acbc3b2ed36fb7bcdc07084d5cd684f28cdb3451 100644 (file)
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -24,7 +24,11 @@
 #include <sstream>
 #include <iomanip>
 #include <time.h>
+#ifdef LIBDCP_WINDOWS
+#include <windows.h>
+#endif
 #include "metadata.h"
+#include "util.h"
 
 using namespace std;
 using namespace libdcp;
@@ -48,40 +52,7 @@ XMLMetadata::XMLMetadata ()
 void
 XMLMetadata::set_issue_date_now ()
 {
-       char buffer[64];
-       time_t now;
-       time (&now);
+       time_t now = time (0);
        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 = tm_to_string (tm);
 }