X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmetadata.h;h=a22d0c2b348c5f5455aedfe82ee269afd31ae07b;hb=9d3e7f716accd67985f23048b4c36e7581348848;hp=7336766d155a5dc4360631cd9a8697fb032fdb2d;hpb=af87bfc82beee0b0600558c84c3843dfd5a252f6;p=libdcp.git

diff --git a/src/metadata.h b/src/metadata.h
index 7336766d..a22d0c2b 100644
--- a/src/metadata.h
+++ b/src/metadata.h
@@ -1,54 +1,83 @@
 /*
-    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.
 */
 
 #ifndef LIBDCP_METADATA_H
 #define LIBDCP_METADATA_H
 
 /** @file  src/metadata.h
- *  @brief Metadata for writing to the DCP.
+ *  @brief XMLMetadata and MXFMetadata classes.
  */
 
 #include <string>
 
-namespace libdcp
+class utc_offset_to_string_test;
+
+namespace ASDCP {
+	struct WriterInfo;
+}
+
+namespace dcp
 {
 
+/** @class MXFMetadata
+ *  @brief Metadata that is written to a MXF file's header
+ */
 class MXFMetadata
 {
 public:
 	MXFMetadata ();
 
+	void read (ASDCP::WriterInfo const & info);
+
 	std::string company_name;
 	std::string product_name;
 	std::string product_version;
 };
 
+/** @class XMLMetadata
+ *  @brief Common metadata that is written to a few different XML files
+ */
 class XMLMetadata
 {
 public:
 	XMLMetadata ();
 
 	void set_issue_date_now ();
-	
+
 	std::string issuer;
 	std::string creator;
 	std::string issue_date;
+	std::string annotation_text;
 };
 
 }