X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_atmos_asset.h;h=e93a54148a4fe9ff75ba4cbca49ef777a036e5d1;hb=201b6fdf572c04424d870ac4d07d1d1a8725b24c;hp=b5e0bc6e720aa9348c75e01211b39d8c0d2b03fb;hpb=e4ed001fff70bd10b94e61bf36cdffd1a679286d;p=libdcp.git

diff --git a/src/reel_atmos_asset.h b/src/reel_atmos_asset.h
index b5e0bc6e..e93a5414 100644
--- a/src/reel_atmos_asset.h
+++ b/src/reel_atmos_asset.h
@@ -1,20 +1,34 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2017 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/reel_atmos_asset.h
@@ -39,17 +53,18 @@ class ReelAtmosAsset : public ReelAsset, public ReelMXF
 {
 public:
 	ReelAtmosAsset (boost::shared_ptr<AtmosAsset> asset, int64_t entry_point);
-	ReelAtmosAsset (boost::shared_ptr<const cxml::Node>);
+	explicit ReelAtmosAsset (boost::shared_ptr<const cxml::Node>);
 
 	boost::shared_ptr<AtmosAsset> asset () const {
 		return asset_of_type<AtmosAsset> ();
 	}
 
-	void write_to_cpl (xmlpp::Node* node, Standard standard) const;
+	xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const;
 
 private:
 	std::string key_type () const;
-	std::string cpl_node_name () const;
+	std::string cpl_node_name (Standard standard) const;
+	std::pair<std::string, std::string> cpl_node_namespace (Standard) const;
 };
 
 }