X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fisdcf_metadata.h;h=f54565f5d93ff5e4d6b3a392065cada5f8b8ae43;hp=0e904238df62ba96c19f28cc3391a2d76d2e307a;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26

diff --git a/src/lib/isdcf_metadata.h b/src/lib/isdcf_metadata.h
index 0e904238d..f54565f5d 100644
--- a/src/lib/isdcf_metadata.h
+++ b/src/lib/isdcf_metadata.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,9 +22,12 @@
 #define DCPOMATIC_ISDCF_METADATA_H
 
 #include <libcxml/cxml.h>
-#include <libxml++/libxml++.h>
 #include <string>
 
+namespace xmlpp {
+	class Node;
+}
+
 class ISDCFMetadata
 {
 public:
@@ -35,19 +39,19 @@ public:
 		, two_d_version_of_three_d (false)
 	{}
 
-	ISDCFMetadata (cxml::ConstNodePtr);
+	explicit ISDCFMetadata (cxml::ConstNodePtr);
 
 	void as_xml (xmlpp::Node *) const;
 	void read_old_metadata (std::string, std::string);
 
 	int content_version;
 	std::string audio_language;
-	std::string subtitle_language;
+	/** if set, this overrides any languages specified in individual Content objects */
+	boost::optional<std::string> subtitle_language;
 	std::string territory;
 	std::string rating;
 	std::string studio;
 	std::string facility;
-	std::string package_type;
 	/** true if this is a temporary version (without final picture or sound) */
 	bool temp_version;
 	/** true if this is a pre-release version (final picture and sound, but without accessibility features) */