X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmetadata.cc;h=ffe49093bd5b0cb6137a16f1781d479bab596515;hb=d927e9b913606f4fc982885c7582ecaf0e3c5a1a;hp=e33826139d82a1d42886ce3b4d4e58446de35127;hpb=2cc2026701c9e8268ba154ec9330c5d56cbdc240;p=libdcp.git

diff --git a/src/metadata.cc b/src/metadata.cc
index e3382613..ffe49093 100644
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
 
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/metadata.cc
@@ -23,9 +37,8 @@
 
 #include "metadata.h"
 #include "util.h"
-#ifdef LIBDCP_WINDOWS
-#include <windows.h>
-#endif
+#include "local_time.h"
+#include "AS_DCP.h"
 #include <sstream>
 #include <iomanip>
 #include <time.h>
@@ -41,6 +54,13 @@ MXFMetadata::MXFMetadata ()
 
 }
 
+void
+MXFMetadata::read (ASDCP::WriterInfo const & info)
+{
+	company_name = info.CompanyName;
+	product_name = info.ProductName;
+	product_version = info.ProductVersion;
+}
 
 XMLMetadata::XMLMetadata ()
 	: issuer ("libdcp" LIBDCP_VERSION)
@@ -49,10 +69,9 @@ XMLMetadata::XMLMetadata ()
 	set_issue_date_now ();
 }
 
+/** Set the issue date to the current local time */
 void
 XMLMetadata::set_issue_date_now ()
 {
-	time_t now = time (0);
-	struct tm* tm = localtime (&now);
-	issue_date = tm_to_string (tm);
+	issue_date = LocalTime().as_string ();
 }