X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmetadata.cc;h=fc6bb39654b2e8120622100fc14a66ba3f3509b7;hb=b7257aefd5e7c3904e34b78b384c7577751df812;hp=3da7da12cd4b7a798914324d98cd6fac548bd10f;hpb=dc35647c6383d0585ed6d9d3dfde32ef129d0d80;p=libdcp.git

diff --git a/src/metadata.cc b/src/metadata.cc
index 3da7da12..fc6bb396 100644
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -1,33 +1,49 @@
 /*
-    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
+    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
- *  @brief Metadata for writing to the DCP.
+ *  @brief XMLMetadata and MXFMetadata classes.
  */
 
-#include <sstream>
+#include "metadata.h"
+#include "util.h"
+#include "local_time.h"
+#include <asdcp/AS_DCP.h>
 #include <iomanip>
 #include <time.h>
-#include "metadata.h"
 
 using namespace std;
-using namespace libdcp;
+using namespace dcp;
 
 MXFMetadata::MXFMetadata ()
 	: company_name ("libdcp")
@@ -37,51 +53,25 @@ 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)
 	, 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 ()
 {
-	char buffer[64];
-	time_t now;
-	time (&now);
-	struct tm* tm = localtime (&now);
-#ifdef LIBDCP_POSIX	
-	strftime (buffer, 64, "%Y-%m-%dT%I:%M:%S%z", tm);
-	issue_date = string (buffer);
-#else
-	/* No %z for strftime on Windows: it will seemingly be interpreted as %Z and will
-	   output some localised string describing the timezone */
-	strftime (buffer, 64, "%Y-%m-%dT%I:%M:%S", tm);
-
-	TIME_ZONE_INFORMATION tz;
-	GetTimeZoneInformation (&tz);
-	issue_date = string (buffer) + bias_to_string (tz.Bias);
-#endif
-}
-
-string
-XMLMetadata::bias_to_string (int b)
-{
-	bool const negative = (b < 0);
-	b = negative ? -b : b;
-
-	int const hours = b / 60;
-	int const minutes = b % 60;
-
-	stringstream o;
-	if (negative) {
-		o << "-";
-	} else {
-		o << "+";
-	}
-
-	o << setw(2) << setfill('0') << hours << setw(2) << setfill('0') << minutes;
-	return o.str ();
+	issue_date = LocalTime().as_string ();
 }