Merge master; MXF subtitle stuff not included.

[libdcp.git] / src / metadata.cc

diff --git a/src/metadata.cc b/src/metadata.cc
index 7d663eb27a929c5d2f8de8d71cb180a8d12a15f0..e33826139d82a1d42886ce3b4d4e58446de35127 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,46 +18,41 @@
 */
 
 /** @file  src/metadata.cc
- *  @brief Metadata for writing to the DCP.
+ *  @brief XMLMetadata and MXFMetadata classes.
  */
 
 #include "metadata.h"
+#include "util.h"
+#ifdef LIBDCP_WINDOWS
+#include <windows.h>
+#endif
+#include <sstream>
+#include <iomanip>
+#include <time.h>
 
 using namespace std;
-using namespace libdcp;
-
-Metadata* Metadata::_instance = 0;
+using namespace dcp;
 
-/** 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)
-       , creator ("libdcp" LIBDCP_VERSION)
 {
-#ifdef LIBDCP_POSIX    
-       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);
-#endif
 
-#ifdef LIBDCP_WINDOWS
-       /* XXX */
-#endif 
 }
 
-/** @return Singleton Metadata instance */
-Metadata *
-Metadata::instance ()
+
+XMLMetadata::XMLMetadata ()
+       : issuer ("libdcp" LIBDCP_VERSION)
+       , creator ("libdcp" LIBDCP_VERSION)
 {
-       if (_instance == 0) {
-               _instance = new Metadata;
-       }
+       set_issue_date_now ();
+}
 
-       return _instance;
+void
+XMLMetadata::set_issue_date_now ()
+{
+       time_t now = time (0);
+       struct tm* tm = localtime (&now);
+       issue_date = tm_to_string (tm);
 }
-