Merge remote-tracking branch 'origin/main' into v1.9.x

[libdcp.git] / src / metadata.cc

diff --git a/src/metadata.cc b/src/metadata.cc
index 6fedc61e0b5e997eda0093b0cb9982ae31b3dd35..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 MXFMetadata class.
+ *  @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)
 {