In-line run of subs_in_out so that it gets the environment more easily.

[libdcp.git] / src / metadata.cc

diff --git a/src/metadata.cc b/src/metadata.cc
index fc6bb39654b2e8120622100fc14a66ba3f3509b7..7fcbab4c2cb05e67efa05bb613141bab4cdb7454 100644 (file)
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,28 +31,35 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/metadata.cc
- *  @brief XMLMetadata and MXFMetadata classes.
+ *  @brief MXFMetadata class
  */
 
+
+#include "local_time.h"
 #include "metadata.h"
 #include "util.h"
-#include "local_time.h"
+#include "version.h"
+LIBDCP_DISABLE_WARNINGS
 #include <asdcp/AS_DCP.h>
+LIBDCP_ENABLE_WARNINGS
 #include <iomanip>
 #include <time.h>
 
-using namespace std;
+
 using namespace dcp;
 
+
 MXFMetadata::MXFMetadata ()
        : company_name ("libdcp")
        , product_name ("libdcp")
-       , product_version (LIBDCP_VERSION)
+       , product_version(dcp::version)
 {
 
 }
 
+
 void
 MXFMetadata::read (ASDCP::WriterInfo const & info)
 {
@@ -61,17 +68,3 @@ MXFMetadata::read (ASDCP::WriterInfo const & info)
        product_version = info.ProductVersion;
 }
 
-XMLMetadata::XMLMetadata ()
-       : issuer ("libdcp" LIBDCP_VERSION)
-       , creator ("libdcp" LIBDCP_VERSION)
-       , annotation_text ("Created by libdcp" LIBDCP_VERSION)
-{
-       set_issue_date_now ();
-}
-
-/** Set the issue date to the current local time */
-void
-XMLMetadata::set_issue_date_now ()
-{
-       issue_date = LocalTime().as_string ();
-}