Fix incorrect free and leak.

[libdcp.git] / src / metadata.cc

diff --git a/src/metadata.cc b/src/metadata.cc
index 7d663eb27a929c5d2f8de8d71cb180a8d12a15f0..2967ac1ddf0183a437b9112b48b7847db7027cf5 100644 (file)
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -21,43 +21,36 @@
  *  @brief Metadata for writing to the DCP.
  */
 
+#include <time.h>
 #include "metadata.h"
 
 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)
 {
-#ifdef LIBDCP_POSIX    
+       set_issue_date_now ();
+}
+
+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);
-#endif
-
-#ifdef LIBDCP_WINDOWS
-       /* XXX */
-#endif 
-}
-
-/** @return Singleton Metadata instance */
-Metadata *
-Metadata::instance ()
-{
-       if (_instance == 0) {
-               _instance = new Metadata;
-       }
-
-       return _instance;
 }